in apropos(1) output, sort names and avoid multiple section numbers

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index 96313bc1133b21ef55979cddf9d29077550d4608..c9fabe260f5fdb15dbebc13e28e06bc465b8c0c8 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,6 +1,7 @@
-/*     $Id: apropos.c,v 1.34 2013/07/05 09:33:02 schwarze 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
@@ -41,6 +42,7 @@ main(int argc, char *argv[])
        char            *defpaths, *auxpaths;
        char            *conf_file;
        char            *progname;
+       const char      *outkey;
        extern char     *optarg;
        extern int       optind;
 
@@ -57,8 +59,9 @@ main(int argc, char *argv[])
 
        auxpaths = defpaths = NULL;
        conf_file = NULL;
+       outkey = "Nd";
 
-       while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
+       while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
                switch (ch) {
                case ('C'):
                        conf_file = optarg;
@@ -69,6 +72,9 @@ main(int argc, char *argv[])
                case ('m'):
                        auxpaths = optarg;
                        break;
+               case ('O'):
+                       outkey = optarg;
+                       break;
                case ('S'):
                        search.arch = optarg;
                        break;
@@ -89,21 +95,25 @@ 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 file] [-M path] [-m path] "
+                       "[-O outkey] "
                        "[-S arch] [-s section]%s ...\n", progname,
                        whatis ? " name" : "\n               expression");
        return(EXIT_FAILURE);