Add libquota

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index b33855e13b367a49b052ab18de5cccf074186d6c..9ef25f5ee4982c152a285fd6c13fa443592608a9 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,4 +1,4 @@
-/*     $Id: apropos.c,v 1.23 2011/12/07 16:08:55 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.25 2011/12/31 18:47:52 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -44,6 +44,7 @@ main(int argc, char *argv[])
        struct opts      opts;
        struct expr     *e;
        char            *defpaths, *auxpaths;
+       char            *conf_file;
        extern int       optind;
        extern char     *optarg;
 
@@ -59,10 +60,14 @@ main(int argc, char *argv[])
        memset(&opts, 0, sizeof(struct opts));
 
        auxpaths = defpaths = NULL;
+       conf_file = NULL;
        e = NULL;
 
-       while (-1 != (ch = getopt(argc, argv, "M:m:S:s:")))
+       while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
                switch (ch) {
+               case ('C'):
+                       conf_file = optarg;
+                       break;
                case ('M'):
                        defpaths = optarg;
                        break;
@@ -88,7 +93,7 @@ main(int argc, char *argv[])
 
        rc = 0;
 
-       manpath_parse(&paths, defpaths, auxpaths);
+       manpath_parse(&paths, conf_file, defpaths, auxpaths);
 
        e = whatis ? termcomp(argc, argv, &terms) :
                     exprcomp(argc, argv, &terms);
@@ -122,7 +127,7 @@ list(struct res *res, size_t sz, void *arg)
        qsort(res, sz, sizeof(struct res), cmp);
 
        for (i = 0; i < (int)sz; i++)
-               printf("%s(%s%s%s) - %s\n", res[i].title,
+               printf("%s(%s%s%s) - %.70s\n", res[i].title,
                                res[i].cat,
                                *res[i].arch ? "/" : "",
                                *res[i].arch ? res[i].arch : "",
@@ -142,10 +147,11 @@ usage(void)
 {
 
        fprintf(stderr, "usage: %s "
+                       "[-C file] "
                        "[-M manpath] "
                        "[-m manpath] "
                        "[-S arch] "
                        "[-s section] "
-                       "expression...\n",
+                       "expression ...\n",
                        progname);
 }