diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-04 14:19:59 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-04 14:19:59 +0200 |
commit | 9a1b2605476c8e6e69a3666e9f538004b6623962 (patch) | |
tree | b0fc11eb7ffc7c5c28aeca6aac2fa3e0c071aefb | |
parent | d678257c26e0993efc48ac4433d153e1e9dfc954 (diff) | |
download | busybox-w32-9a1b2605476c8e6e69a3666e9f538004b6623962.tar.gz busybox-w32-9a1b2605476c8e6e69a3666e9f538004b6623962.tar.bz2 busybox-w32-9a1b2605476c8e6e69a3666e9f538004b6623962.zip |
man: add compatibility with man-db
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r-- | miscutils/man.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/miscutils/man.c b/miscutils/man.c index 2d3776cf3..b356e726f 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
@@ -182,16 +182,21 @@ int man_main(int argc UNUSED_PARAM, char **argv) | |||
182 | pager = "more"; | 182 | pager = "more"; |
183 | } | 183 | } |
184 | 184 | ||
185 | /* Parse man.conf[ig] */ | 185 | /* Parse man.conf[ig] or man_db.conf */ |
186 | /* man version 1.6f uses man.config */ | 186 | /* man version 1.6f uses man.config */ |
187 | /* man-db implementation of man uses man_db.conf */ | ||
187 | parser = config_open2("/etc/man.config", fopen_for_read); | 188 | parser = config_open2("/etc/man.config", fopen_for_read); |
188 | if (!parser) | 189 | if (!parser) |
189 | parser = config_open2("/etc/man.conf", fopen_for_read); | 190 | parser = config_open2("/etc/man.conf", fopen_for_read); |
191 | if (!parser) | ||
192 | parser = config_open2("/etc/man_db.conf", fopen_for_read); | ||
190 | 193 | ||
191 | while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) { | 194 | while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) { |
192 | if (!token[1]) | 195 | if (!token[1]) |
193 | continue; | 196 | continue; |
194 | if (strcmp("MANPATH", token[0]) == 0) { | 197 | if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */ |
198 | || strcmp("MANDATORY_MANPATH", token[0]) == 0 | ||
199 | ) { | ||
195 | char *path = token[1]; | 200 | char *path = token[1]; |
196 | while (*path) { | 201 | while (*path) { |
197 | char *next_path; | 202 | char *next_path; |