1 files changed, 24 insertions, 30 deletions

diff --git a/miscutils/man.c b/miscutils/man.c
index 0bc11e623..6724b4b5d 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -13,9 +13,9 @@
 //kbuild:lib-$(CONFIG_MAN) += man.o
 
 //usage:#define man_trivial_usage
-//usage:       "[-aw] [MANPAGE]..."
+//usage:       "[-aw] MANPAGE..."
 //usage:#define man_full_usage "\n\n"
-//usage:       "Format and display manual page\n"
+//usage:       "Display manual page\n"
 //usage:     "\n        -a      Display all pages"
 //usage:     "\n        -w      Show page locations"
 //usage:     "\n"
@@ -209,9 +209,6 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
                 path_element = man_path_list;
                 if (path_element) while (*path_element) {
                         if (strcmp(*path_element, path) == 0) {
-                                /* Have path but haven't counted it, must be default */
-                                if (*count_mp == 0)
-                                        break;
                                 goto skip;
                         }
                         path_element++;
@@ -247,14 +244,14 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 {
         parser_t *parser;
         char *sec_list;
-        char *cur_path, *cur_sect;
         char **man_path_list;
         int count_mp;
-        int cur_mp;
         int opt, not_found;
         char *token[2];
 #if ENABLE_PLATFORM_MINGW32
         char **ptr;
+        char *exepath, *relpath;
+        const char *mpl[] = { "/usr/man", "/usr/share/man", NULL, NULL };
 #endif
 
         INIT_G();
@@ -276,16 +273,6 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         man_path_list = add_MANPATH(NULL, &count_mp,
                         getenv("MANDATORY_MANPATH"+10) /* "MANPATH" */
         );
-        if (!man_path_list) {
-                /* default, may be overridden by /etc/man.conf */
-                man_path_list = xzalloc(2 * sizeof(man_path_list[0]));
-                man_path_list[0] = (char*)"/usr/man";
-                /* count_mp stays 0.
-                 * Thus, man.conf will overwrite man_path_list[0]
-                 * if a path is defined there.
-                 */
-        }
-
         /* Parse man.conf[ig] or man_db.conf */
         /* man version 1.6f uses man.config */
         /* man-db implementation of man uses man_db.conf */
@@ -299,7 +286,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 if (!token[1])
                         continue;
                 if (strcmp("DEFINE", token[0]) == 0) {
-                        G.col   = if_redefined(G.tbl  , "col",   token[1]);
+                        G.col   = if_redefined(G.col  , "col",   token[1]);
                         G.tbl   = if_redefined(G.tbl  , "tbl",   token[1]);
                         G.nroff = if_redefined(G.nroff, "nroff", token[1]);
                         G.pager = if_redefined(G.pager, "pager", token[1]);
@@ -317,17 +304,22 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         config_close(parser);
 
 #if ENABLE_PLATFORM_MINGW32
-        {
-                char *exepath = xstrdup(bb_busybox_exec_path);
-                char *relpath = concat_path_file(dirname(exepath), "man");
-                if (count_mp == 0) {
-                        /* default must match path set above */
-                        man_path_list = add_MANPATH(man_path_list, &count_mp,
-                                                                                (char *)"/usr/man");
-                }
+        /* allow man pages to be stored relative to the executable */
+        exepath = xstrdup(bb_busybox_exec_path);
+        relpath = concat_path_file(dirname(exepath), "man");
+
+        if (!man_path_list) {
+                mpl[2] = relpath;
+                man_path_list = (char**)mpl;
+        }
+        else {
                 man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
-                free(relpath);
-                free(exepath);
+        }
+#else
+        if (!man_path_list) {
+                static const char *const mpl[] = { "/usr/man", "/usr/share/man", NULL };
+                man_path_list = (char**)mpl;
+                /*count_mp = 2; - not used below anyway */
         }
 #endif
 
@@ -347,16 +339,18 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
         not_found = 0;
         do { /* for each argv[] */
+                const char *cur_path;
+                int cur_mp;
                 int found = 0;
-                cur_mp = 0;
 
                 if (strchr(*argv, '/')) {
                         found = show_manpage(*argv, /*man:*/ 1, 0);
                         goto check_found;
                 }
+                cur_mp = 0;
                 while ((cur_path = man_path_list[cur_mp++]) != NULL) {
                         /* for each MANPATH */
-                        cur_sect = sec_list;
+                        const char *cur_sect = sec_list;
                         do { /* for each section */
                                 char *next_sect = strchrnul(cur_sect, ':');
                                 int sect_len = next_sect - cur_sect;