version 1.7, 2011/12/13 21:09:01 |
version 1.9, 2012/06/08 10:32:40 |
Line 74 manpath_parse(struct manpaths *dirs, const char *file, |
|
Line 74 manpath_parse(struct manpaths *dirs, const char *file, |
|
|
|
do { |
do { |
buf = mandoc_realloc(buf, bsz + 1024); |
buf = mandoc_realloc(buf, bsz + 1024); |
sz = fread(buf + (int)bsz, 1, 1024, stream); |
sz = fread(buf + bsz, 1, 1024, stream); |
bsz += sz; |
bsz += sz; |
} while (sz > 0); |
} while (sz > 0); |
|
|
Line 87 manpath_parse(struct manpaths *dirs, const char *file, |
|
Line 87 manpath_parse(struct manpaths *dirs, const char *file, |
|
free(buf); |
free(buf); |
pclose(stream); |
pclose(stream); |
#else |
#else |
manpath_parseline(dirs, auxp); |
char *insert; |
|
|
if (NULL == defp) |
/* Always prepend -m. */ |
defp = getenv("MANPATH"); |
manpath_parseline(dirs, auxp); |
|
|
|
/* If -M is given, it overrides everything else. */ |
|
if (NULL != defp) { |
|
manpath_parseline(dirs, defp); |
|
return; |
|
} |
|
|
if (NULL == defp) |
/* MANPATH and man.conf(5) cooperate. */ |
manpath_manconf(dirs, file ? file : MAN_CONF_FILE); |
defp = getenv("MANPATH"); |
else |
if (NULL == file) |
|
file = MAN_CONF_FILE; |
|
|
|
/* No MANPATH; use man.conf(5) only. */ |
|
if (NULL == defp || '\0' == defp[0]) { |
|
manpath_manconf(dirs, file); |
|
return; |
|
} |
|
|
|
/* Prepend man.conf(5) to MANPATH. */ |
|
if (':' == defp[0]) { |
|
manpath_manconf(dirs, file); |
manpath_parseline(dirs, defp); |
manpath_parseline(dirs, defp); |
|
return; |
|
} |
|
|
|
/* Append man.conf(5) to MANPATH. */ |
|
if (':' == defp[strlen(defp) - 1]) { |
|
manpath_parseline(dirs, defp); |
|
manpath_manconf(dirs, file); |
|
return; |
|
} |
|
|
|
/* Insert man.conf(5) into MANPATH. */ |
|
insert = strstr(defp, "::"); |
|
if (NULL != insert) { |
|
*insert++ = '\0'; |
|
manpath_parseline(dirs, defp); |
|
manpath_manconf(dirs, file); |
|
manpath_parseline(dirs, insert + 1); |
|
return; |
|
} |
|
|
|
/* MANPATH overrides man.conf(5) completely. */ |
|
manpath_parseline(dirs, defp); |
#endif |
#endif |
} |
} |
|
|
Line 123 manpath_add(struct manpaths *dirs, const char *dir) |
|
Line 162 manpath_add(struct manpaths *dirs, const char *dir) |
|
{ |
{ |
char buf[PATH_MAX]; |
char buf[PATH_MAX]; |
char *cp; |
char *cp; |
int i; |
size_t i; |
|
|
if (NULL == (cp = realpath(dir, buf))) |
if (NULL == (cp = realpath(dir, buf))) |
return; |
return; |
Line 134 manpath_add(struct manpaths *dirs, const char *dir) |
|
Line 173 manpath_add(struct manpaths *dirs, const char *dir) |
|
|
|
dirs->paths = mandoc_realloc |
dirs->paths = mandoc_realloc |
(dirs->paths, |
(dirs->paths, |
((size_t)dirs->sz + 1) * sizeof(char *)); |
(dirs->sz + 1) * sizeof(char *)); |
|
|
dirs->paths[dirs->sz++] = mandoc_strdup(cp); |
dirs->paths[dirs->sz++] = mandoc_strdup(cp); |
} |
} |
Line 142 manpath_add(struct manpaths *dirs, const char *dir) |
|
Line 181 manpath_add(struct manpaths *dirs, const char *dir) |
|
void |
void |
manpath_free(struct manpaths *p) |
manpath_free(struct manpaths *p) |
{ |
{ |
int i; |
size_t i; |
|
|
for (i = 0; i < p->sz; i++) |
for (i = 0; i < p->sz; i++) |
free(p->paths[i]); |
free(p->paths[i]); |