[BACK]Return to cgi.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/cgi.c between version 1.144 and 1.148

version 1.144, 2017/01/21 01:20:31 version 1.148, 2017/02/22 16:20:01
Line 21 
Line 21 
 #include <sys/time.h>  #include <sys/time.h>
   
 #include <ctype.h>  #include <ctype.h>
   #if HAVE_ERR
 #include <err.h>  #include <err.h>
   #endif
 #include <errno.h>  #include <errno.h>
 #include <fcntl.h>  #include <fcntl.h>
 #include <limits.h>  #include <limits.h>
Line 113  static const char *const sec_names[] = {
Line 115  static const char *const sec_names[] = {
 static  const int sec_MAX = sizeof(sec_names) / sizeof(char *);  static  const int sec_MAX = sizeof(sec_names) / sizeof(char *);
   
 static  const char *const arch_names[] = {  static  const char *const arch_names[] = {
     "amd64",       "alpha",       "armv7",      "amd64",       "alpha",       "armv7",      "arm64",
     "hppa",        "i386",        "landisk",      "hppa",        "i386",        "landisk",
     "loongson",    "luna88k",     "macppc",      "mips64",      "loongson",    "luna88k",     "macppc",      "mips64",
     "octeon",      "sgi",         "socppc",      "sparc64",      "octeon",      "sgi",         "socppc",      "sparc64",
Line 799  resp_format(const struct req *req, const char *file)
Line 801  resp_format(const struct req *req, const char *file)
   
         memset(&conf, 0, sizeof(conf));          memset(&conf, 0, sizeof(conf));
         conf.fragment = 1;          conf.fragment = 1;
           conf.style = mandoc_strdup(CSS_DIR "/mandoc.css");
         usepath = strcmp(req->q.manpath, req->p[0]);          usepath = strcmp(req->q.manpath, req->p[0]);
         mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",          mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",
             usepath ? req->q.manpath : "", usepath ? "/" : "");              usepath ? req->q.manpath : "", usepath ? "/" : "");
Line 826  resp_format(const struct req *req, const char *file)
Line 829  resp_format(const struct req *req, const char *file)
         mparse_free(mp);          mparse_free(mp);
         mchars_free();          mchars_free();
         free(conf.man);          free(conf.man);
           free(conf.style);
 }  }
   
 static void  static void
Line 973  main(void)
Line 977  main(void)
         const char      *path;          const char      *path;
         const char      *querystring;          const char      *querystring;
         int              i;          int              i;
   
   #if HAVE_PLEDGE
           /*
            * The "rpath" pledge could be revoked after mparse_readfd()
            * if the file desciptor to "/footer.html" would be opened
            * up front, but it's probably not worth the complication
            * of the code it would cause: it would require scattering
            * pledge() calls in multiple low-level resp_*() functions.
            */
   
           if (pledge("stdio rpath", NULL) == -1) {
                   warn("pledge");
                   pg_error_internal();
                   return EXIT_FAILURE;
           }
   #endif
   
         /* Poor man's ReDoS mitigation. */          /* Poor man's ReDoS mitigation. */
   

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.148

CVSweb