tar: support -T - and -X -

[oweals/busybox.git] / miscutils / man.c

diff --git a/miscutils/man.c b/miscutils/man.c
index 2d3776cf3a660f2fe8d2cd83cb452e89beef2f39..b356e726fcabd2d73a97ab205a5ba2403f0ff2f0 100644 (file)
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -182,16 +182,21 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                        pager = "more";
        }
 
-       /* Parse man.conf[ig] */
+       /* Parse man.conf[ig] or man_db.conf */
        /* man version 1.6f uses man.config */
+       /* man-db implementation of man uses man_db.conf */
        parser = config_open2("/etc/man.config", fopen_for_read);
        if (!parser)
                parser = config_open2("/etc/man.conf", fopen_for_read);
+       if (!parser)
+               parser = config_open2("/etc/man_db.conf", fopen_for_read);
 
        while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
                if (!token[1])
                        continue;
-               if (strcmp("MANPATH", token[0]) == 0) {
+               if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */
+                || strcmp("MANDATORY_MANPATH", token[0]) == 0
+               ) {
                        char *path = token[1];
                        while (*path) {
                                char *next_path;