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

Diff for /mandoc/cgi.c between version 1.104 and 1.108

version 1.104, 2015/02/10 08:05:30 version 1.108, 2015/04/18 16:34:25
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>   * Copyright (c) 2014, 2015 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
  * copyright notice and this permission notice appear in all copies.   * copyright notice and this permission notice appear in all copies.
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
Line 30 
Line 30 
 #include <string.h>  #include <string.h>
 #include <unistd.h>  #include <unistd.h>
   
 #include "mandoc.h"  
 #include "mandoc_aux.h"  #include "mandoc_aux.h"
   #include "mandoc.h"
   #include "roff.h"
 #include "main.h"  #include "main.h"
 #include "manpath.h"  #include "manconf.h"
 #include "mansearch.h"  #include "mansearch.h"
 #include "cgi.h"  #include "cgi.h"
   
Line 816  catman(const struct req *req, const char *file)
Line 817  catman(const struct req *req, const char *file)
 static void  static void
 format(const struct req *req, const char *file)  format(const struct req *req, const char *file)
 {  {
           struct manoutput conf;
         struct mparse   *mp;          struct mparse   *mp;
         struct mchars   *mchars;          struct mchars   *mchars;
         struct mdoc     *mdoc;          struct roff_man *man;
         struct man      *man;  
         void            *vp;          void            *vp;
         char            *opts;  
         int              fd;          int              fd;
         int              usepath;          int              usepath;
   
Line 836  format(const struct req *req, const char *file)
Line 836  format(const struct req *req, const char *file)
         mparse_readfd(mp, fd, file);          mparse_readfd(mp, fd, file);
         close(fd);          close(fd);
   
           memset(&conf, 0, sizeof(conf));
           conf.fragment = 1;
         usepath = strcmp(req->q.manpath, req->p[0]);          usepath = strcmp(req->q.manpath, req->p[0]);
         mandoc_asprintf(&opts,          mandoc_asprintf(&conf.man, "%s?query=%%N&sec=%%S%s%s%s%s",
             "fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",  
             scriptname,              scriptname,
             req->q.arch ? "&arch="       : "",              req->q.arch ? "&arch="       : "",
             req->q.arch ? req->q.arch    : "",              req->q.arch ? req->q.arch    : "",
             usepath     ? "&manpath="    : "",              usepath     ? "&manpath="    : "",
             usepath     ? req->q.manpath : "");              usepath     ? req->q.manpath : "");
   
         mparse_result(mp, &mdoc, &man, NULL);          mparse_result(mp, &man, NULL);
         if (NULL == man && NULL == mdoc) {          if (man == NULL) {
                 fprintf(stderr, "fatal mandoc error: %s/%s\n",                  fprintf(stderr, "fatal mandoc error: %s/%s\n",
                     req->q.manpath, file);                      req->q.manpath, file);
                 pg_error_internal();                  pg_error_internal();
Line 855  format(const struct req *req, const char *file)
Line 856  format(const struct req *req, const char *file)
                 return;                  return;
         }          }
   
         vp = html_alloc(mchars, opts);          vp = html_alloc(mchars, &conf);
   
         if (NULL != mdoc)          if (man->macroset == MACROSET_MDOC)
                 html_mdoc(vp, mdoc);                  html_mdoc(vp, man);
         else          else
                 html_man(vp, man);                  html_man(vp, man);
   
         html_free(vp);          html_free(vp);
         mparse_free(mp);          mparse_free(mp);
         mchars_free(mchars);          mchars_free(mchars);
         free(opts);          free(conf.man);
 }  }
   
 static void  static void
Legend:
Removed from v.1.104  
changed lines
  Added in v.1.108
CVSweb