]> git.cameronkatri.com Git - mandoc.git/blobdiff - apropos.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
While I'm rooting around, note that we depend on sqlite3 now, not berkeley.
[mandoc.git] / apropos.c
diff --git a/apropos.c b/apropos.c
index f70243a2e7247a74164bfd2a129dfd83ddef10b9..469bff5e5a19d7e08fa96144417fe7aef439366b 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,7 +1,6 @@
-/*     $Id: apropos.c,v 1.17 2011/11/20 21:36:00 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.31 2012/06/08 10:44:52 kristaps 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>
  *
  * 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,53 +17,30 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <sys/param.h>
 
 #include <assert.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <getopt.h>
 #include <getopt.h>
-#include <limits.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"
-
-/*
- * FIXME: add support for manpath(1), which everybody but OpenBSD and
- * NetBSD seem to use.
- */
-#define MAN_CONF_FILE  "/etc/man.conf"
-#define MAN_CONF_KEY   "_whatdb"
-
-/*
- * 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     manpath_parseconf(struct manpaths *);
-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;
+       size_t           i, sz;
+       struct manpage  *res;
+       char            *conf_file, *defpaths, *auxpaths,
+                       *arch, *sec;
        struct manpaths  paths;
        struct manpaths  paths;
-       size_t           terms;
-       struct opts      opts;
-       struct expr     *e;
-       char            *defpaths, *auxpaths;
-       extern int       optind;
+       char            *progname;
        extern char     *optarg;
        extern char     *optarg;
+       extern int       optind;
 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)
 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)
@@ -72,15 +48,14 @@ main(int argc, char *argv[])
        else
                ++progname;
 
        else
                ++progname;
 
+       auxpaths = defpaths = conf_file = arch = sec = NULL;
        memset(&paths, 0, sizeof(struct manpaths));
        memset(&paths, 0, sizeof(struct manpaths));
-       memset(&opts, 0, sizeof(struct opts));
 
 
-       auxpaths = defpaths = NULL;
-       e = NULL;
-       rc = 0;
-
-       while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) 
+       while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
                switch (ch) {
                switch (ch) {
+               case ('C'):
+                       conf_file = optarg;
+                       break;
                case ('M'):
                        defpaths = optarg;
                        break;
                case ('M'):
                        defpaths = optarg;
                        break;
@@ -88,189 +63,42 @@ main(int argc, char *argv[])
                        auxpaths = optarg;
                        break;
                case ('S'):
                        auxpaths = optarg;
                        break;
                case ('S'):
-                       opts.arch = optarg;
+                       arch = optarg;
                        break;
                case ('s'):
                        break;
                case ('s'):
-                       opts.cat = optarg;
+                       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 (NULL != getenv("MANPATH"))
-               defpaths = getenv("MANPATH");
+       if (0 == argc)
+               goto usage;
 
 
-       if (NULL == defpaths)
-               manpath_parseconf(&paths);
-       else
-               manpath_parse(&paths, defpaths);
+       manpath_parse(&paths, conf_file, defpaths, auxpaths);
+       ch = mansearch(&paths, arch, sec, argc, argv, &res, &sz);
+       manpath_free(&paths);
 
 
-       manpath_parse(&paths, auxpaths);
+       if (0 == ch)
+               goto usage;
 
 
-       if (NULL == (e = exprcomp(argc, argv, &terms))) {
-               fprintf(stderr, "%s: Bad expression\n", progname);
-               goto out;
+       for (i = 0; i < sz; i++) {
+               printf("%s - %s\n", res[i].file, res[i].desc);
+               free(res[i].desc);
        }
 
        }
 
-       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;
-
-       qsort(res, sz, sizeof(struct res), 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);
-}
-
-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] "
-                       "[-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;
-
-       if (NULL == path)
-               return;
-
-       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;
-       int              i;
-
-       if (NULL == (cp = realpath(dir, buf)))
-               return;
-
-       for (i = 0; i < dirs->sz; i++)
-               if (0 == strcmp(dirs->paths[i], dir))
-                       return;
-
-       dirs->paths = mandoc_realloc
-               (dirs->paths, 
-                ((size_t)dirs->sz + 1) * sizeof(char *));
-
-       dirs->paths[dirs->sz++] = mandoc_strdup(cp);
-}
-
-static void
-manpath_parseconf(struct manpaths *dirs) 
-{
-       FILE            *stream;
-#ifdef USE_MANPATH
-       char            *buf;
-       size_t           sz, bsz;
-
-       stream = popen("manpath", "r");
-       if (NULL == stream)
-               return;
-
-       buf = NULL;
-       bsz = 0;
-
-       do {
-               buf = mandoc_realloc(buf, bsz + 1024);
-               sz = fread(buf + (int)bsz, 1, 1024, stream);
-               bsz += sz;
-       } while (sz > 0);
-
-       assert(bsz && '\n' == buf[bsz - 1]);
-       buf[bsz - 1] = '\0';
-
-       manpath_parse(dirs, buf);
-       free(buf);
-       pclose(stream);
-#else
-       char            *p, *q;
-       size_t           len, keysz;
-
-       keysz = strlen(MAN_CONF_KEY);
-       assert(keysz > 0);
-
-       if (NULL == (stream = fopen(MAN_CONF_FILE, "r")))
-               return;
-
-       while (NULL != (p = fgetln(stream, &len))) {
-               if (0 == len || '\n' == p[--len])
-                       break;
-               p[len] = '\0';
-               while (isspace((unsigned char)*p))
-                       p++;
-               if (strncmp(MAN_CONF_KEY, p, keysz))
-                       continue;
-               p += keysz;
-               while (isspace(*p))
-                       p++;
-               if ('\0' == *p)
-                       continue;
-               if (NULL == (q = strrchr(p, '/')))
-                       continue;
-               *q = '\0';
-               manpath_add(dirs, p);
-       }
-
-       fclose(stream);
-#endif
+       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);
+       return(EXIT_FAILURE);
 }
 }
A git conversion mirror of mandoc.bsd.lv