summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-07-24 00:28:12 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-07-24 00:28:12 (GMT)
commit0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d (patch)
tree66adc3a9eaace0e85a8b2c2790c764e7678e9955
parent7cee00e8ae515400b36e1464e55414ccc569c05b (diff)
downloadbusybox-0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d.tar.gz
busybox-0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d.tar.bz2
man: use man.config, not only man.conf (man version 1.6f compat)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/man.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/miscutils/man.c b/miscutils/man.c
index 672ddb1..a4ff274 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -182,8 +182,12 @@ int man_main(int argc UNUSED_PARAM, char **argv)
pager = "more";
}
- /* Parse man.conf */
- parser = config_open2("/etc/man.conf", fopen_for_read);
+ /* Parse man.conf[ig] */
+ /* 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)) {
if (!token[1])
continue;