[BACK]Return to cgi.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/cgi.c between version 1.105 and 1.106

version 1.105, 2019/07/10 12:48:08 version 1.106, 2019/10/01 17:54:04
Line 1 
Line 1 
 /*      $OpenBSD$ */  /*      $OpenBSD$ */
 /*  /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017, 2018 Ingo Schwarze <schwarze@usta.de>   * Copyright (c) 2014-2019 Ingo Schwarze <schwarze@usta.de>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 73 
Line 73 
 static  void             pg_error_badrequest(const char *);  static  void             pg_error_badrequest(const char *);
 static  void             pg_error_internal(void);  static  void             pg_error_internal(void);
 static  void             pg_index(const struct req *);  static  void             pg_index(const struct req *);
 static  void             pg_noresult(const struct req *, const char *);  static  void             pg_noresult(const struct req *, int, const char *,
                                   const char *);
 static  void             pg_redirect(const struct req *, const char *);  static  void             pg_redirect(const struct req *, const char *);
 static  void             pg_search(const struct req *);  static  void             pg_search(const struct req *);
 static  void             pg_searchres(const struct req *,  static  void             pg_searchres(const struct req *,
Line 542 
Line 543 
 }  }
   
 static void  static void
 pg_noresult(const struct req *req, const char *msg)  pg_noresult(const struct req *req, int code, const char *http_msg,
       const char *user_msg)
 {  {
         resp_begin_html(200, NULL, NULL);          resp_begin_html(code, http_msg, NULL);
         resp_searchform(req, FOCUS_QUERY);          resp_searchform(req, FOCUS_QUERY);
         puts("<p>");          puts("<p>");
         puts(msg);          puts(user_msg);
         puts("</p>");          puts("</p>");
         resp_end_html();          resp_end_html();
 }  }
Line 1012 
Line 1014 
         if (req->isquery && req->q.equal && argc == 1)          if (req->isquery && req->q.equal && argc == 1)
                 pg_redirect(req, argv[0]);                  pg_redirect(req, argv[0]);
         else if (mansearch(&search, &paths, argc, argv, &res, &ressz) == 0)          else if (mansearch(&search, &paths, argc, argv, &res, &ressz) == 0)
                 pg_noresult(req, "You entered an invalid query.");                  pg_noresult(req, 400, "Bad Request",
                       "You entered an invalid query.");
         else if (ressz == 0)          else if (ressz == 0)
                 pg_noresult(req, "No results found.");                  pg_noresult(req, 404, "Not Found", "No results found.");
         else          else
                 pg_searchres(req, res, ressz);                  pg_searchres(req, res, ressz);
   
Legend:
Removed from v.1.105  
changed lines
  Added in v.1.106