version 1.30, 2016/05/28 13:44:13 |
version 1.31, 2016/07/19 22:40:33 |
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
#include "manconf.h" |
#include "manconf.h" |
|
|
#if !HAVE_MANPATH |
|
static void manconf_file(struct manconf *, const char *); |
static void manconf_file(struct manconf *, const char *); |
#endif |
|
static void manpath_add(struct manpaths *, const char *, int); |
static void manpath_add(struct manpaths *, const char *, int); |
static void manpath_parseline(struct manpaths *, char *, int); |
static void manpath_parseline(struct manpaths *, char *, int); |
|
|
|
|
manconf_parse(struct manconf *conf, const char *file, |
manconf_parse(struct manconf *conf, const char *file, |
char *defp, char *auxp) |
char *defp, char *auxp) |
{ |
{ |
#if HAVE_MANPATH |
|
char cmd[(PATH_MAX * 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. */ |
|
|
|
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 + 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(&conf->manpath, buf, 1); |
|
} |
|
|
|
free(buf); |
|
pclose(stream); |
|
#else |
|
char *insert; |
char *insert; |
|
|
/* Always prepend -m. */ |
/* Always prepend -m. */ |
Line 137 manconf_parse(struct manconf *conf, const char *file, |
|
Line 89 manconf_parse(struct manconf *conf, const char *file, |
|
|
|
/* MANPATH overrides man.conf(5) completely. */ |
/* MANPATH overrides man.conf(5) completely. */ |
manpath_parseline(&conf->manpath, defp, 0); |
manpath_parseline(&conf->manpath, defp, 0); |
#endif |
|
} |
} |
|
|
/* |
/* |
Line 204 manconf_free(struct manconf *conf) |
|
Line 155 manconf_free(struct manconf *conf) |
|
free(conf->output.style); |
free(conf->output.style); |
} |
} |
|
|
#if !HAVE_MANPATH |
|
static void |
static void |
manconf_file(struct manconf *conf, const char *file) |
manconf_file(struct manconf *conf, const char *file) |
{ |
{ |
|
|
if (*manpath_default != '\0') |
if (*manpath_default != '\0') |
manpath_parseline(&conf->manpath, manpath_default, 0); |
manpath_parseline(&conf->manpath, manpath_default, 0); |
} |
} |
#endif |
|
|
|
void |
void |
manconf_output(struct manoutput *conf, const char *cp) |
manconf_output(struct manoutput *conf, const char *cp) |