diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-07-24 02:28:12 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-07-24 02:28:12 +0200 |
| commit | 0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d (patch) | |
| tree | 66adc3a9eaace0e85a8b2c2790c764e7678e9955 /miscutils/man.c | |
| parent | 7cee00e8ae515400b36e1464e55414ccc569c05b (diff) | |
| download | busybox-w32-0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d.tar.gz busybox-w32-0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d.tar.bz2 busybox-w32-0e1b626b9a38abd7f1c5fb3dfccf5b99d3d35d8d.zip | |
man: use man.config, not only man.conf (man version 1.6f compat)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/man.c')
| -rw-r--r-- | miscutils/man.c | 8 |
1 files changed, 6 insertions, 2 deletions
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) | |||
| 182 | pager = "more"; | 182 | pager = "more"; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | /* Parse man.conf */ | 185 | /* Parse man.conf[ig] */ |
| 186 | parser = config_open2("/etc/man.conf", fopen_for_read); | 186 | /* man version 1.6f uses man.config */ |
| 187 | parser = config_open2("/etc/man.config", fopen_for_read); | ||
| 188 | if (!parser) | ||
| 189 | parser = config_open2("/etc/man.conf", fopen_for_read); | ||
| 190 | |||
| 187 | while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) { | 191 | while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) { |
| 188 | if (!token[1]) | 192 | if (!token[1]) |
| 189 | continue; | 193 | continue; |