* mdocml: Have apropos(1) take advantage of manpath.h instead of doing the
@ 2011-11-23 9:50 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2011-11-23 9:50 UTC (permalink / raw)
To: source
Log Message:
-----------
Have apropos(1) take advantage of manpath.h instead of doing the work
itself.
Modified Files:
--------------
mdocml:
apropos.c
Revision Data
-------------
Index: apropos.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/apropos.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lapropos.c -Lapropos.c -u -p -r1.17 -r1.18
--- apropos.c
+++ apropos.c
@@ -22,34 +22,16 @@
#include <assert.h>
#include <ctype.h>
#include <getopt.h>
-#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.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;
-};
+#include "manpath.h"
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;
@@ -57,7 +39,7 @@ static char *progname;
int
main(int argc, char *argv[])
{
- int i, ch, rc;
+ int ch, rc;
struct manpaths paths;
size_t terms;
struct opts opts;
@@ -106,15 +88,7 @@ main(int argc, char *argv[])
goto out;
}
- if (NULL != getenv("MANPATH"))
- defpaths = getenv("MANPATH");
-
- if (NULL == defpaths)
- manpath_parseconf(&paths);
- else
- manpath_parse(&paths, defpaths);
-
- manpath_parse(&paths, auxpaths);
+ manpath_parse(&paths, defpaths, auxpaths);
if (NULL == (e = exprcomp(argc, argv, &terms))) {
fprintf(stderr, "%s: Bad expression\n", progname);
@@ -130,10 +104,7 @@ main(int argc, char *argv[])
"manual database\n", progname);
out:
- for (i = 0; i < paths.sz; i++)
- free(paths.paths[i]);
-
- free(paths.paths);
+ manpath_free(&paths);
exprfree(e);
return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
@@ -173,104 +144,4 @@ usage(void)
"[-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
}
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-23 9:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-23 9:50 mdocml: Have apropos(1) take advantage of manpath.h instead of doing the kristaps
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).