Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-23 05:29:58 +00:00
Code Issues Projects Releases Wiki Activity

man: add compatibility with man-db

Browse Source 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2010-10-04 14:19:59 +02:00
parent d678257c26
commit 9a1b260547
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
miscutils/man.c
View File

@ -182,16 +182,21 @@ int man_main(int argc UNUSED_PARAM, char **argv)
pager = "more"; pager = "more";
} }
/* Parse man.conf[ig] */ /* Parse man.conf[ig] or man_db.conf */
/* man version 1.6f uses man.config */ /* man version 1.6f uses man.config */
/* man-db implementation of man uses man_db.conf */
parser = config_open2("/etc/man.config", fopen_for_read); parser = config_open2("/etc/man.config", fopen_for_read);
if (!parser) if (!parser)
parser = config_open2("/etc/man.conf", fopen_for_read); parser = config_open2("/etc/man.conf", fopen_for_read);
if (!parser)
parser = config_open2("/etc/man_db.conf", fopen_for_read);
while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) { while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
if (!token[1]) if (!token[1])
continue; continue;
if (strcmp("MANPATH", token[0]) == 0) { if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */
|| strcmp("MANDATORY_MANPATH", token[0]) == 0
) {
char *path = token[1]; char *path = token[1];
while (*path) { while (*path) {
char *next_path; char *next_path;