[git commit] man: use man.config, not only man.conf (man version 1.6f compat)

Denys Vlasenko vda.linux at googlemail.com
Fri Jul 24 00:28:12 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/man.c |    8 ++++++--
 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;
-- 
1.6.3.3



More information about the busybox-cvs mailing list