* mdocml: Have manpath.c properly use manpath(1), that is, using -C and -m
@ 2011-12-13 20:56 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2011-12-13 20:56 UTC (permalink / raw)
To: source
Log Message:
-----------
Have manpath.c properly use manpath(1), that is, using -C and -m and so on.
This also cleans up the code a little bit. While here, make some functions
static that are only used within manpath.c.
Modified Files:
--------------
mdocml:
manpath.c
manpath.h
Revision Data
-------------
Index: manpath.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/manpath.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmanpath.h -Lmanpath.h -u -p -r1.4 -r1.5
--- manpath.h
+++ manpath.h
@@ -31,8 +31,6 @@ __BEGIN_DECLS
void manpath_manconf(struct manpaths *, const char *);
void manpath_parse(struct manpaths *, const char *, char *, char *);
-void manpath_parseconf(struct manpaths *, const char *);
-void manpath_parseline(struct manpaths *, char *);
void manpath_free(struct manpaths *);
__END_DECLS
Index: manpath.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/manpath.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lmanpath.c -Lmanpath.c -u -p -r1.5 -r1.6
--- manpath.c
+++ manpath.c
@@ -19,7 +19,8 @@
#include "config.h"
#endif
-#include <sys/types.h>
+#include <sys/param.h>
+
#include <assert.h>
#include <ctype.h>
#include <limits.h>
@@ -34,27 +35,75 @@
#define MAN_CONF_KEY "_whatdb"
static void manpath_add(struct manpaths *, const char *);
+static void manpath_parseline(struct manpaths *, char *);
void
manpath_parse(struct manpaths *dirs, const char *file,
char *defp, char *auxp)
{
+#ifdef USE_MANPATH
+ char cmd[(MAXPATHLEN * 3) + 20];
+ FILE *stream;
+ char *buf;
+ size_t sz, bsz;
+
+ strlcpy(cmd, "manpath", sizeof(cmd));
+ if (file) {
+ strlcat(cmd, " -C ", sizeof(cmd));
+ strlcat(cmd, file, sizeof(cmd));
+ }
+ if (auxp) {
+ strlcat(cmd, " -m ", sizeof(cmd));
+ strlcat(cmd, auxp, sizeof(cmd));
+ }
+ if (defp) {
+ strlcat(cmd, " -M ", sizeof(cmd));
+ strlcat(cmd, defp, sizeof(cmd));
+ }
+
+ /* Open manpath(1). Ignore errors. */
+
+ warnx(cmd);
+ stream = popen(cmd, "r");
+ if (NULL == stream)
+ return;
+
+ buf = NULL;
+ bsz = 0;
+
+ /* Read in as much output as we can. */
+
+ do {
+ buf = mandoc_realloc(buf, bsz + 1024);
+ sz = fread(buf + (int)bsz, 1, 1024, stream);
+ bsz += sz;
+ } while (sz > 0);
+
+ if ( ! ferror(stream) && feof(stream) &&
+ bsz && '\n' == buf[bsz - 1]) {
+ buf[bsz - 1] = '\0';
+ manpath_parseline(dirs, buf);
+ }
+ free(buf);
+ pclose(stream);
+#else
manpath_parseline(dirs, auxp);
if (NULL == defp)
defp = getenv("MANPATH");
if (NULL == defp)
- manpath_parseconf(dirs, file);
+ manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
else
manpath_parseline(dirs, defp);
+#endif
}
/*
* Parse a FULL pathname from a colon-separated list of arrays.
*/
-void
+static void
manpath_parseline(struct manpaths *dirs, char *path)
{
char *dir;
@@ -89,44 +138,6 @@ manpath_add(struct manpaths *dirs, const
((size_t)dirs->sz + 1) * sizeof(char *));
dirs->paths[dirs->sz++] = mandoc_strdup(cp);
-}
-
-void
-manpath_parseconf(struct manpaths *dirs, const char *file)
-{
-#ifdef USE_MANPATH
- FILE *stream;
- char *buf;
- size_t sz, bsz;
-
- /* Open manpath(1). Ignore errors. */
-
- stream = popen("manpath", "r");
- if (NULL == stream)
- return;
-
- buf = NULL;
- bsz = 0;
-
- /* Read in as much output as we can. */
-
- do {
- buf = mandoc_realloc(buf, bsz + 1024);
- sz = fread(buf + (int)bsz, 1, 1024, stream);
- bsz += sz;
- } while (sz > 0);
-
- if ( ! ferror(stream) && feof(stream) &&
- bsz && '\n' == buf[bsz - 1]) {
- buf[bsz - 1] = '\0';
- manpath_parseline(dirs, buf);
- }
-
- free(buf);
- pclose(stream);
-#else
- manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
-#endif
}
void
--
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-12-13 20:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-13 20:56 mdocml: Have manpath.c properly use manpath(1), that is, using -C and -m 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).