Merge branch 'busybox' into merge

3 files changed, 30 insertions, 16 deletions

diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 12a77b70f..7b695b26f 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -353,7 +353,7 @@ static void fb_drawimage(void)
         if (LONE_DASH(G.image_filename)) {
                 theme_file = stdin;
         } else {
-                int fd = open_zipped(G.image_filename);
+                int fd = open_zipped(G.image_filename, /*fail_if_not_compressed:*/ 0);
                 if (fd < 0)
                         bb_simple_perror_msg_and_die(G.image_filename);
                 theme_file = xfdopen_for_read(fd);
diff --git a/miscutils/less.c b/miscutils/less.c
index 60105f42b..574f222e0 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -98,16 +98,18 @@
 //config:         Enables "-N" command.
 
 //usage:#define less_trivial_usage
-//usage:       "[-E" IF_FEATURE_LESS_FLAGS("Mm") "Nh~I?] [FILE]..."
+//usage:       "[-E" IF_FEATURE_LESS_REGEXP("I")IF_FEATURE_LESS_FLAGS("Mm") "Nh~] [FILE]..."
 //usage:#define less_full_usage "\n\n"
 //usage:       "View FILE (or stdin) one screenful at a time\n"
 //usage:     "\n        -E      Quit once the end of a file is reached"
+//usage:        IF_FEATURE_LESS_REGEXP(
+//usage:     "\n        -I      Ignore case in all searches"
+//usage:        )
 //usage:        IF_FEATURE_LESS_FLAGS(
 //usage:     "\n        -M,-m   Display status line with line numbers"
 //usage:     "\n                and percentage through the file"
 //usage:        )
 //usage:     "\n        -N      Prefix line number to each line"
-//usage:     "\n        -I      Ignore case in all searches"
 //usage:     "\n        -~      Suppress ~s displayed past EOF"
 
 #include <sched.h>  /* sched_yield() */
@@ -1613,10 +1615,13 @@ int less_main(int argc, char **argv)
 
         INIT_G();
 
-        /* TODO: -x: do not interpret backspace, -xx: tab also */
-        /* -xxx: newline also */
-        /* -w N: assume width N (-xxx -w 32: hex viewer of sorts) */
-        getopt32(argv, "EMmN~I" IF_FEATURE_LESS_DASHCMD("S"));
+        /* TODO: -x: do not interpret backspace, -xx: tab also
+         * -xxx: newline also
+         * -w N: assume width N (-xxx -w 32: hex viewer of sorts)
+         * -s: condense many empty lines to one
+         *     (used by some setups for manpage display)
+         */
+        getopt32(argv, "EMmN~I" IF_FEATURE_LESS_DASHCMD("S") /*ignored:*/"s");
         argc -= optind;
         argv += optind;
         num_files = argc;
diff --git a/miscutils/man.c b/miscutils/man.c
index 429898643..0e0b1cba6 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -102,11 +102,12 @@ static int run_pipe(const char *pager, char *man_filename, int man, int level)
 
  ordinary_manpage:
         close(STDIN_FILENO);
-        open_zipped(man_filename); /* guaranteed to use fd 0 (STDIN_FILENO) */
+        open_zipped(man_filename, /*fail_if_not_compressed:*/ 0); /* guaranteed to use fd 0 (STDIN_FILENO) */
         /* "2>&1" is added so that nroff errors are shown in pager too.
          * Otherwise it may show just empty screen */
         cmd = xasprintf(
-                man ? "gtbl | nroff -Tlatin1 -mandoc 2>&1 | %s"
+                /* replaced -Tlatin1 with -Tascii for non-UTF8 displays */
+                man ? "gtbl | nroff -Tascii -mandoc 2>&1 | %s"
                     : "%s",
                 pager);
         system(cmd);
@@ -150,7 +151,7 @@ int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int man_main(int argc UNUSED_PARAM, char **argv)
 {
         parser_t *parser;
-        const char *pager;
+        const char *pager = ENABLE_LESS ? "less" : "more";
         char **man_path_list;
         char *sec_list;
         char *cur_path, *cur_sect;
@@ -171,12 +172,6 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 man_path_list[0] = (char*)"/usr/man";
         else
                 count_mp++;
-        pager = getenv("MANPAGER");
-        if (!pager) {
-                pager = getenv("PAGER");
-                if (!pager)
-                        pager = "more";
-        }
 
         /* Parse man.conf[ig] or man_db.conf */
         /* man version 1.6f uses man.config */
@@ -190,6 +185,11 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
                 if (!token[1])
                         continue;
+                if (strcmp("DEFINE", token[0]) == 0) {
+                        if (strncmp("pager", token[1], 5) == 0) {
+                                pager = xstrdup(skip_whitespace(token[1]) + 5);
+                        }
+                } else
                 if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */
                  || strcmp("MANDATORY_MANPATH", token[0]) == 0
                 ) {
@@ -234,6 +234,15 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         }
         config_close(parser);
 
+        {
+                /* environment overrides setting from man.config */
+                char *env_pager = getenv("MANPAGER");
+                if (!env_pager)
+                        env_pager = getenv("PAGER");
+                if (env_pager)
+                        pager = env_pager;
+        }
+
         not_found = 0;
         do { /* for each argv[] */
                 int found = 0;