delete some TODO entries that were already fixed

[mandoc.git] / manpage.c

diff --git a/manpage.c b/manpage.c
index 70eb06b69ceb6b6a9959577b35b56f7a09811352..dda6089c0ac1b95e932a900bf487daa34716a0d7 100644 (file)
--- a/manpage.c
+++ b/manpage.c
@@ -1,4 +1,4 @@
-/*     $Id: manpage.c,v 1.9 2014/08/17 03:24:47 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;
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
                return(EXIT_FAILURE);
 
        for (i = 0; i < sz; i++) {
-               printf("%6zu  %s: %s\n", 
+               printf("%6zu  %s: %s\n",
                        i + 1, res[i].names, res[i].output);
                free(res[i].names);
                free(res[i].output);
@@ -148,11 +148,11 @@ show:
        /* NOTREACHED */
 usage:
        fprintf(stderr, "usage: %s [-C conf] "
-                                 "[-M paths] "
+                                 "[-M paths] "
                                  "[-m paths] "
                                  "[-S arch] "
                                  "[-s section] "
-                                 "expr ...\n", 
+                                 "expr ...\n",
                                  progname);
        return(EXIT_FAILURE);
 }
@@ -174,9 +174,9 @@ show(const char *cmd, const char *file)
        } else if (pid > 0) {
                dup2(fds[0], STDIN_FILENO);
                close(fds[1]);
-               cmd = NULL != getenv("MANPAGER") ? 
+               cmd = NULL != getenv("MANPAGER") ?
                        getenv("MANPAGER") :
-                       (NULL != getenv("PAGER") ? 
+                       (NULL != getenv("PAGER") ?
                         getenv("PAGER") : "more");
                execlp(cmd, cmd, (char *)NULL);
                perror(cmd);