Simplify: Remove an unused argument from the mandoc_eos() function.

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index 5278832e8d1cdcef14db4801141ebf76f31a4809..c629257e131968c2793edec582dcbe04bb3a6944 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,7 +1,7 @@
-/*     $Id: apropos.c,v 1.27 2012/03/24 00:31:55 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.36 2013/12/31 03:41:14 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
@@ -22,33 +22,29 @@
 
 #include <assert.h>
 #include <getopt.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "apropos_db.h"
-#include "mandoc.h"
 #include "manpath.h"
-
-static int      cmp(const void *, const void *);
-static void     list(struct res *, size_t, void *);
-static void     usage(void);
-
-static char    *progname;
+#include "mansearch.h"
 
 int
 main(int argc, char *argv[])
 {
-       int              ch, rc, whatis;
-       struct res      *res;
+       int              ch, whatis;
+       struct mansearch search;
+       size_t           i, sz;
+       struct manpage  *res;
        struct manpaths  paths;
-       size_t           terms, ressz;
-       struct opts      opts;
-       struct expr     *e;
        char            *defpaths, *auxpaths;
        char            *conf_file;
-       extern int       optind;
+       char            *progname;
+       char            *outkey;
        extern char     *optarg;
+       extern int       optind;
 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)
@@ -56,18 +52,16 @@ main(int argc, char *argv[])
        else
                ++progname;
 
-       whatis = 0 == strncmp(progname, "whatis", 6);
+       whatis = (0 == strncmp(progname, "whatis", 6));
 
        memset(&paths, 0, sizeof(struct manpaths));
-       memset(&opts, 0, sizeof(struct opts));
+       memset(&search, 0, sizeof(struct mansearch));
 
-       ressz = 0;
-       res = NULL;
        auxpaths = defpaths = NULL;
        conf_file = NULL;
-       e = NULL;
+       outkey = NULL;
 
-       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;
@@ -78,88 +72,51 @@ main(int argc, char *argv[])
                case ('m'):
                        auxpaths = optarg;
                        break;
+               case ('O'):
+                       outkey = optarg;
+                       break;
                case ('S'):
-                       opts.arch = optarg;
+                       search.arch = optarg;
                        break;
                case ('s'):
-                       opts.cat = optarg;
+                       search.sec = optarg;
                        break;
                default:
-                       usage();
-                       return(EXIT_FAILURE);
+                       goto usage;
                }
 
        argc -= optind;
        argv += optind;
 
-       if (0 == argc) 
-               return(EXIT_SUCCESS);
+       if (0 == argc)
+               goto usage;
 
-       rc = 0;
+       search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+       search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
        manpath_parse(&paths, conf_file, defpaths, auxpaths);
-
-       e = whatis ? termcomp(argc, argv, &terms) :
-                    exprcomp(argc, argv, &terms);
-               
-       if (NULL == e) {
-               fprintf(stderr, "%s: Bad expression\n", progname);
-               goto out;
-       }
-
-       rc = apropos_search
-               (paths.sz, paths.paths, &opts, 
-                e, terms, NULL, &ressz, &res, list);
-
-       if (0 == rc) {
-               fprintf(stderr, "%s: Bad database\n", progname);
-               goto out;
-       }
-out:
+       ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
        manpath_free(&paths);
-       resfree(res, ressz);
-       exprfree(e);
-       return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-
-/* ARGSUSED */
-static void
-list(struct res *res, size_t sz, void *arg)
-{
-       size_t           i;
 
-       qsort(res, sz, sizeof(struct res), cmp);
+       if (0 == ch)
+               goto usage;
 
        for (i = 0; i < sz; i++) {
-               if ( ! res[i].matched)
-                       continue;
-               printf("%s(%s%s%s) - %.70s\n", 
-                               res[i].title,
-                               res[i].cat,
-                               *res[i].arch ? "/" : "",
-                               *res[i].arch ? res[i].arch : "",
-                               res[i].desc);
+               printf("%s - %s\n", res[i].names,
+                   NULL == outkey ? res[i].desc :
+                   NULL == res[i].output ? "" : res[i].output);
+               free(res[i].file);
+               free(res[i].names);
+               free(res[i].desc);
+               free(res[i].output);
        }
-}
-
-static int
-cmp(const void *p1, const void *p2)
-{
-
-       return(strcasecmp(((const struct res *)p1)->title,
-                               ((const struct res *)p2)->title));
-}
-
-static void
-usage(void)
-{
 
-       fprintf(stderr, "usage: %s "
-                       "[-C file] "
-                       "[-M manpath] "
-                       "[-m manpath] "
-                       "[-S arch] "
-                       "[-s section] "
-                       "expression ...\n",
-                       progname);
+       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);
 }