From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 24 Jul 2009 00:28:12 +0000 (+0200)
Subject: man: use man.config, not only man.conf (man version 1.6f compat)
X-Git-Tag: 1_15_0~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d;p=oweals%2Fbusybox.git

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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/miscutils/man.c b/miscutils/man.c
index 672ddb1c8..a4ff274d4 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;