-/* $Id: apropos.c,v 1.13 2011/11/14 10:07:06 kristaps 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
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <sys/param.h>
#include <assert.h>
#include <getopt.h>
-#include <limits.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"
+#include "mansearch.h"
-static int cmp(const void *, const void *);
-static void list(struct rec *, size_t, void *);
-static void usage(void);
-
-static char *progname;
int
main(int argc, char *argv[])
{
- int ch;
- size_t sz;
- char *buf;
- 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;
-
- memset(&opts, 0, sizeof(struct opts));
+ extern int optind;
progname = strrchr(argv[0], '/');
if (progname == NULL)
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) {
- case ('S'):
- opts.arch = optarg;
+ case 'C':
+ conf_file = optarg;
+ break;
+ case 'M':
+ defpaths = optarg;
break;
- case ('s'):
- opts.cat = optarg;
+ case 'm':
+ auxpaths = optarg;
+ break;
+ case 'O':
+ outkey = optarg;
+ break;
+ case 'S':
+ search.arch = optarg;
+ break;
+ case 's':
+ 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;
- /*
- * Collapse expressions into a single string.
- * First count up the contained strings, adding a space at the
- * end of each (plus nil-terminator). Then merge.
- */
+ search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+ search.flags = whatis ? MANSEARCH_WHATIS : 0;
- for (sz = 0, ch = 0; ch < argc; ch++)
- sz += strlen(argv[ch]) + 1;
+ manpath_parse(&paths, conf_file, defpaths, auxpaths);
+ mansearch_setup(1);
+ ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
+ manpath_free(&paths);
- buf = mandoc_malloc(++sz);
+ if (0 == ch)
+ goto usage;
- for (*buf = '\0', ch = 0; ch < argc; ch++) {
- strlcat(buf, argv[ch], sz);
- strlcat(buf, " ", sz);
+ 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);
}
- buf[sz - 2] = '\0';
-
- if (NULL == (e = exprcomp(buf))) {
- fprintf(stderr, "Bad expression\n");
- free(buf);
- return(EXIT_FAILURE);
- }
-
- free(buf);
-
- /*
- * Configure databases.
- * The keyword database is a btree that allows for duplicate
- * entries.
- * The index database is a recno.
- */
-
- 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);
-}
-
-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)
-{
-
- 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);
}
git.ckatri.com / mandoc.git / blobdiff