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

[mandoc.git] / manpage.c

diff --git a/manpage.c b/manpage.c
index 999f3d3247621a76c86d40dd7395a1b41a599d31..dda6089c0ac1b95e932a900bf487daa34716a0d7 100644 (file)
--- a/manpage.c
+++ b/manpage.c
@@ -1,4 +1,4 @@
-/*     $Id: manpage.c,v 1.10 2015/02/10 08:05:30 schwarze Exp $ */
+/*     $Id: manpage.c,v 1.11 2015/03/27 17:37:25 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 
 static void     show(const char *, const char *);
@@ -43,7 +43,7 @@ main(int argc, char *argv[])
        char            *conf_file, *defpaths, *auxpaths, *cp;
        char             buf[PATH_MAX];
        const char      *cmd;
-       struct manpaths  paths;
+       struct manconf   conf;
        char            *progname;
        extern char     *optarg;
        extern int       optind;
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
                ++progname;
 
        auxpaths = defpaths = conf_file = NULL;
-       memset(&paths, 0, sizeof(struct manpaths));
+       memset(&conf, 0, sizeof(conf));
        memset(&search, 0, sizeof(struct mansearch));
 
        while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
@@ -90,9 +90,9 @@ main(int argc, char *argv[])
        search.outkey = "Nd";
        search.argmode = ARG_EXPR;
 
-       manpath_parse(&paths, conf_file, defpaths, auxpaths);
-       ch = mansearch(&search, &paths, argc, argv, &res, &sz);
-       manpath_free(&paths);
+       manconf_parse(&conf, conf_file, defpaths, auxpaths);
+       ch = mansearch(&search, &conf.manpath, argc, argv, &res, &sz);
+       manconf_free(&conf);
 
        if (0 == ch)
                goto usage;