From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sun, 14 Sep 2008 21:30:35 +0000 (-0000)
Subject: man: do not use default if /etc/man.conf has different MANPATH
X-Git-Tag: 1_13_0~188
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a1e16c9298756e54161d9bf7d24b03415e2707c0;p=oweals%2Fbusybox.git

man: do not use default if /etc/man.conf has different MANPATH
 do not warn if /etc/man.conf does not exist
---

diff --git a/miscutils/man.c b/miscutils/man.c
index 26fd44ddf..24551c0e0 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -168,11 +168,13 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
 	sec_list = xstrdup("1:2:3:4:5:6:7:8:9");
 	/* Last valid man_path_list[] is [0x10] */
+	count_mp = 0;
 	man_path_list = xzalloc(0x11 * sizeof(man_path_list[0]));
 	man_path_list[0] = getenv("MANPATH");
-	if (!man_path_list[0])
+	if (!man_path_list[0]) /* default, may be overridden by /etc/man.conf */
 		man_path_list[0] = (char*)"/usr/man";
-	count_mp = 1;
+	else
+		count_mp++;
 	pager = getenv("MANPAGER");
 	if (!pager) {
 		pager = getenv("PAGER");
@@ -181,7 +183,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 	}
 
 	/* Parse man.conf */
-	parser = config_open("/etc/man.conf");
+	parser = config_open2("/etc/man.conf", fopen_for_read);
 	while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
 		if (!token[1])
 			continue;