After skipping an escape sequence with incomplete arguments,

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index 6ed6f64c992eb544d8c820bcc3effd8db2911174..80b6bc6d036e965fa85926ceb1303c3360e6b1c6 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,6 +1,7 @@
-/*     $Id: apropos.c,v 1.12 2011/11/13 11:10:27 schwarze Exp $ */
+/*     $Id: apropos.c,v 1.39 2014/04/20 16:46:04 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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


@@ -14,32 +15,37 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#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"
-
-static int      cmp(const void *, const void *);
-static void     list(struct rec *, size_t, void *);
-static void     usage(void);
+#include "manpath.h"
+#include "mansearch.h"

 
 

-static char    *progname;

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

-       int              ch;
-       struct opts      opts;
-       struct expr     *e;
-       extern int       optind;
+       int              ch, whatis;
+       struct mansearch search;
+       size_t           i, sz;
+       struct manpage  *res;
+       struct manpaths  paths;
+       char            *defpaths, *auxpaths;
+       char            *conf_file;
+       char            *progname;
+       const char      *outkey;

        extern char     *optarg;
        extern char     *optarg;

-
-       memset(&opts, 0, sizeof(struct opts));
+       extern int       optind;

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


@@ -47,74 +53,71 @@ main(int argc, char *argv[])
        else
                ++progname;
 
        else
                ++progname;
 

-       while (-1 != (ch = getopt(argc, argv, "S:s:"))) 
+       whatis = (0 == strncmp(progname, "whatis", 6));
+
+       memset(&paths, 0, sizeof(struct manpaths));
+       memset(&search, 0, sizeof(struct mansearch));
+
+       auxpaths = defpaths = NULL;
+       conf_file = NULL;
+       outkey = "Nd";
+
+       while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))

                switch (ch) {
                switch (ch) {

-               case ('S'):
-                       opts.arch = optarg;
+               case 'C':
+                       conf_file = optarg;
+                       break;
+               case 'M':
+                       defpaths = optarg;
+                       break;
+               case 'm':
+                       auxpaths = optarg;

                        break;
                        break;

-               case ('s'):
-                       opts.cat = optarg;
+               case 'O':
+                       outkey = optarg;
+                       break;
+               case 'S':
+                       search.arch = optarg;
+                       break;
+               case 's':
+                       search.sec = optarg;

                        break;
                default:
                        break;
                default:

-                       usage();
-                       return(EXIT_FAILURE);
+                       goto usage;

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

-       if (0 == argc) 
-               return(EXIT_SUCCESS);
+       if (0 == argc)
+               goto usage;

 
 

-       if (NULL == (e = exprcomp(argc, argv))) {
-               fprintf(stderr, "Bad expression\n");
-               return(EXIT_FAILURE);
-       }
+       search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+       search.flags = whatis ? MANSEARCH_WHATIS : 0;

 
 

-       /*
-        * Configure databases.
-        * The keyword database is a btree that allows for duplicate
-        * entries.
-        * The index database is a recno.
-        */
+       manpath_parse(&paths, conf_file, defpaths, auxpaths);
+       mansearch_setup(1);
+       ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
+       manpath_free(&paths);

 
 

-       apropos_search(&opts, e, NULL, list);
-       exprfree(e);
-       return(EXIT_SUCCESS);
-}
-
-/* ARGSUSED */
-static void
-list(struct rec *res, size_t sz, void *arg)
-{
-       int              i;
-
-       qsort(res, sz, sizeof(struct rec), cmp);
-
-       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);
-}
+       if (0 == ch)
+               goto usage;

 
 

-static int
-cmp(const void *p1, const void *p2)
-{
-
-       return(strcmp(((const struct rec *)p1)->title,
-                               ((const struct rec *)p2)->title));
-}
-
-static void
-usage(void)
-{
+       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);
+       }

 
 

-       fprintf(stderr, "usage: %s "
-                       "[-I] "
-                       "[-S arch] "
-                       "[-s section] "
-                       "EXPR\n", 
-                       progname);
+       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);

 }
 }