Next speed optimization step for the new apropos(1).

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index ac56a96109638400613d9c8f1b44dc7bb0c18f2d..c9fabe260f5fdb15dbebc13e28e06bc465b8c0c8 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,6 +1,7 @@
-/*     $Id: apropos.c,v 1.33 2012/06/09 17:49:13 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.37 2014/01/06 03:02:46 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -37,9 +38,11 @@ main(int argc, char *argv[])
        struct mansearch search;
        size_t           i, sz;
        struct manpage  *res;
-       char            *conf_file, *defpaths, *auxpaths;
        struct manpaths  paths;
+       char            *defpaths, *auxpaths;
+       char            *conf_file;
        char            *progname;
+       const char      *outkey;
        extern char     *optarg;
        extern int       optind;
 
@@ -49,12 +52,16 @@ main(int argc, char *argv[])
        else
                ++progname;
 
-       auxpaths = defpaths = conf_file = NULL;
+       whatis = (0 == strncmp(progname, "whatis", 6));
+
        memset(&paths, 0, sizeof(struct manpaths));
        memset(&search, 0, sizeof(struct mansearch));
-       whatis = (0 == strcmp(progname, "whatis"));
 
-       while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
+       auxpaths = defpaths = NULL;
+       conf_file = NULL;
+       outkey = "Nd";
+
+       while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
                switch (ch) {
                case ('C'):
                        conf_file = optarg;
@@ -65,6 +72,9 @@ main(int argc, char *argv[])
                case ('m'):
                        auxpaths = optarg;
                        break;
+               case ('O'):
+                       outkey = optarg;
+                       break;
                case ('S'):
                        search.arch = optarg;
                        break;
@@ -85,26 +95,26 @@ main(int argc, char *argv[])
        search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
        manpath_parse(&paths, conf_file, defpaths, auxpaths);
-       ch = mansearch(&search, &paths, argc, argv, &res, &sz);
+       ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
        manpath_free(&paths);
 
        if (0 == ch)
                goto usage;
 
        for (i = 0; i < sz; i++) {
-               printf("%s - %s\n", res[i].file, res[i].desc);
-               free(res[i].desc);
+               printf("%s - %s\n", res[i].names,
+                   NULL == res[i].output ? "" : res[i].output);
+               free(res[i].file);
+               free(res[i].names);
+               free(res[i].output);
        }
 
        free(res);
        return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
 usage:
-       fprintf(stderr, "usage: %s [-C conf] "
-                                 "[-M paths] "
-                                 "[-m paths] "
-                                 "[-S arch] "
-                                 "[-s section] "
-                                 "expr ...\n", 
-                                 progname);
+       fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
+                       "[-O outkey] "
+                       "[-S arch] [-s section]%s ...\n", progname,
+                       whatis ? " name" : "\n               expression");
        return(EXIT_FAILURE);
 }