Fix a few lies; polish wording and formatting while here.

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index 17435768b4bf3635a6581b9bc9635d2e5d6a3e0b..48f01bb62eda476fb74928cd628e01568bbf8bff 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,7 +1,7 @@
-/*     $Id: apropos.c,v 1.16 2011/11/20 16:29:50 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.38 2014/04/11 15:46:52 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -18,43 +18,33 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

+#include <sys/param.h>

 
 #include <assert.h>
 #include <getopt.h>
 
 #include <assert.h>
 #include <getopt.h>

-#include <limits.h>
+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <unistd.h>

 
 

-#include "apropos_db.h"
-#include "mandoc.h"
-
-/*
- * List of paths to be searched for manual databases.
- */
-struct manpaths {
-       int       sz;
-       char    **paths;
-};
-
-static int      cmp(const void *, const void *);
-static void     list(struct res *, size_t, void *);
-static void     manpath_add(struct manpaths *, const char *);
-static void     manpath_parse(struct manpaths *, char *);
-static void     usage(void);
-
-static char    *progname;
+#include "manpath.h"
+#include "mansearch.h"

 
 int
 main(int argc, char *argv[])
 {
 
 int
 main(int argc, char *argv[])
 {

-       int              i, ch, rc;
+       int              ch, whatis;
+       struct mansearch search;
+       size_t           i, sz;
+       struct manpage  *res;

        struct manpaths  paths;
        struct manpaths  paths;

-       size_t           terms;
-       struct opts      opts;
-       struct expr     *e;
-       extern int       optind;
+       char            *defpaths, *auxpaths;
+       char            *conf_file;
+       char            *progname;
+       const char      *outkey;

        extern char     *optarg;
        extern char     *optarg;

+       extern int       optind;

 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)
 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)


@@ -62,131 +52,71 @@ main(int argc, char *argv[])
        else
                ++progname;
 
        else
                ++progname;
 

+       whatis = (0 == strncmp(progname, "whatis", 6));
+

        memset(&paths, 0, sizeof(struct manpaths));
        memset(&paths, 0, sizeof(struct manpaths));

-       memset(&opts, 0, sizeof(struct opts));
+       memset(&search, 0, sizeof(struct mansearch));

 
 

-       e = NULL;
-       rc = 0;
+       auxpaths = defpaths = NULL;
+       conf_file = NULL;
+       outkey = "Nd";

 
 

-       while (-1 != (ch = getopt(argc, argv, "m:S:s:"))) 
+       while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))

                switch (ch) {
                switch (ch) {

+               case ('C'):
+                       conf_file = optarg;
+                       break;
+               case ('M'):
+                       defpaths = optarg;
+                       break;

                case ('m'):
                case ('m'):

-                       manpath_parse(&paths, optarg);
+                       auxpaths = optarg;
+                       break;
+               case ('O'):
+                       outkey = optarg;

                        break;
                case ('S'):
                        break;
                case ('S'):

-                       opts.arch = optarg;
+                       search.arch = optarg;

                        break;
                case ('s'):
                        break;
                case ('s'):

-                       opts.cat = optarg;
+                       search.sec = optarg;

                        break;
                default:
                        break;
                default:

-                       usage();
-                       goto out;
+                       goto usage;

                }
 
        argc -= optind;
        argv += optind;
 
                }
 
        argc -= optind;
        argv += optind;
 

-       if (0 == argc) {
-               rc = 1;
-               goto out;
-       }
+       if (0 == argc)
+               goto usage;

 
 

-       /*
-        * Let MANPATH override our default paths.
-        */
+       search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+       search.flags = whatis ? MANSEARCH_WHATIS : 0;

 
 

-       if (NULL != getenv("MANPATH"))
-               manpath_add(&paths, getenv("MANPATH"));
-       else
-               manpath_add(&paths, ".");
-
-       if (NULL == (e = exprcomp(argc, argv, &terms))) {
-               fprintf(stderr, "%s: Bad expression\n", progname);
-               goto out;
-       }
-
-       rc = apropos_search
-               (paths.sz, paths.paths, 
-                &opts, e, terms, NULL, list);
-
-       if (0 == rc) 
-               fprintf(stderr, "%s: Error reading "
-                               "manual database\n", progname);
-
-out:
-       for (i = 0; i < paths.sz; i++)
-               free(paths.paths[i]);
-
-       free(paths.paths);
-       exprfree(e);
-
-       return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-
-/* ARGSUSED */
-static void
-list(struct res *res, size_t sz, void *arg)
-{
-       int              i;
+       manpath_parse(&paths, conf_file, defpaths, auxpaths);
+       mansearch_setup(1);
+       ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
+       manpath_free(&paths);

 
 

-       qsort(res, sz, sizeof(struct res), cmp);
+       if (0 == ch)
+               goto usage;

 
 

-       for (i = 0; i < (int)sz; i++)
-               printf("%s(%s%s%s) - %s\n", res[i].title, 
-                               res[i].cat, 
-                               *res[i].arch ? "/" : "",
-                               *res[i].arch ? res[i].arch : "",
-                               res[i].desc);
-}
-
-static int
-cmp(const void *p1, const void *p2)
-{
-
-       return(strcmp(((const struct res *)p1)->title,
-                               ((const struct res *)p2)->title));
-}
-
-static void
-usage(void)
-{
-
-       fprintf(stderr, "usage: %s "
-                       "[-m dirs] "
-                       "[-S arch] "
-                       "[-s section] "
-                       "expression...\n", progname);
-}
-
-/*
- * Parse a FULL pathname from a colon-separated list of arrays.
- */
-static void
-manpath_parse(struct manpaths *dirs, char *path) 
-{
-       char    *dir;
-
-       for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))
-               manpath_add(dirs, dir);
-}
-
-/*
- * Add a directory to the array, ignoring bad directories.
- * Grow the array one-by-one for simplicity's sake.
- */
-static void
-manpath_add(struct manpaths *dirs, const char *dir) 
-{
-       char             buf[PATH_MAX];
-       char            *cp;
-
-       if (NULL == (cp = realpath(dir, buf)))
-               return;
-
-       dirs->paths = mandoc_realloc
-               (dirs->paths, 
-                ((size_t)dirs->sz + 1) * sizeof(char *));
+       for (i = 0; i < sz; i++) {
+               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);
+       }

 
 

-       dirs->paths[dirs->sz++] = mandoc_strdup(cp);
+       free(res);
+       mansearch_setup(0);
+       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);

 }
 }