man: use man.config, not only man.conf (man version 1.6f compat)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-07-24 02:28:12 +02:00
parent 7cee00e8ae
commit 0e1b626b9a

View File

@ -182,8 +182,12 @@ int man_main(int argc UNUSED_PARAM, char **argv)
pager = "more"; pager = "more";
} }
/* Parse man.conf */ /* Parse man.conf[ig] */
parser = config_open2("/etc/man.conf", fopen_for_read); /* man version 1.6f uses man.config */
parser = config_open2("/etc/man.config", fopen_for_read);
if (!parser)
parser = config_open2("/etc/man.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;