On a new RS nesting level, the saved width starts from the default

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 05d1b8a0df010f4083a2762eaa22a046ddcaec9f..402be8f9e9d9607da3b1eb1b06a6c737f47fd956 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,15 +1,15 @@
-/*     $Id: cgi.c,v 1.104 2015/02/10 08:05:30 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.106 2015/03/27 21:33:20 schwarze Exp $ */
 /*
  * 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
  * purpose with or without fee is hereby granted, provided that the above
  * 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
- * 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
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -33,7 +33,7 @@
 #include "mandoc.h"
 #include "mandoc_aux.h"
 #include "main.h"
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 #include "cgi.h"
 
@@ -816,12 +816,12 @@ catman(const struct req *req, const char *file)
 static void
 format(const struct req *req, const char *file)
 {
+       struct manoutput conf;
        struct mparse   *mp;
        struct mchars   *mchars;
        struct mdoc     *mdoc;
        struct man      *man;
        void            *vp;
-       char            *opts;
        int              fd;
        int              usepath;
 
@@ -836,9 +836,10 @@ format(const struct req *req, const char *file)
        mparse_readfd(mp, fd, file);
        close(fd);
 
+       memset(&conf, 0, sizeof(conf));
+       conf.fragment = 1;
        usepath = strcmp(req->q.manpath, req->p[0]);
-       mandoc_asprintf(&opts,
-           "fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",
+       mandoc_asprintf(&conf.man, "%s?query=%%N&sec=%%S%s%s%s%s",
            scriptname,
            req->q.arch ? "&arch="       : "",
            req->q.arch ? req->q.arch    : "",
@@ -855,7 +856,7 @@ format(const struct req *req, const char *file)
                return;
        }
 
-       vp = html_alloc(mchars, opts);
+       vp = html_alloc(mchars, &conf);
 
        if (NULL != mdoc)
                html_mdoc(vp, mdoc);
@@ -865,7 +866,7 @@ format(const struct req *req, const char *file)
        html_free(vp);
        mparse_free(mp);
        mchars_free(mchars);
-       free(opts);
+       free(conf.man);
 }
 
 static void