Merge branch 'busybox' into merge

5 files changed, 76 insertions, 7 deletions

diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index fab21291c..8e93060ca 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -101,7 +101,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
         if (flags & OPTION_J) {
                 uint32_t *crc32_table;
 
-                crc32_table = crc32_filltable(NULL, 0);
+                crc32_table = crc32_new_table_le();
 
                 cleanmarker.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
                 cleanmarker.nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER);
diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c
index bafb834b5..95c930d12 100644
--- a/miscutils/hexedit.c
+++ b/miscutils/hexedit.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config HEXEDIT
-//config:       bool "hexedit"
+//config:       bool "hexedit (20 kb)"
 //config:       default y
 //config:       help
 //config:       Edit file in hexadecimal.
diff --git a/miscutils/less.c b/miscutils/less.c
index 4ab0e17da..41e4989ad 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -99,6 +99,22 @@
 //config:       bool "Enable -N (dynamic switching of line numbers)"
 //config:       default y
 //config:       depends on FEATURE_LESS_DASHCMD
+//config:
+//config:config FEATURE_LESS_RAW
+//config:       bool "Enable -R ('raw control characters')"
+//config:       default y
+//config:       depends on FEATURE_LESS_DASHCMD
+//config:       help
+//config:       This is essential for less applet to work with tools that use colors
+//config:       and paging, such as git, systemd tools or nmcli.
+//config:
+//config:config FEATURE_LESS_ENV
+//config:       bool "Take options from $LESS environment variable"
+//config:       default y
+//config:       depends on FEATURE_LESS_DASHCMD
+//config:       help
+//config:       This is essential for less applet to work with tools that use colors
+//config:       and paging, such as git, systemd tools or nmcli.
 
 //applet:IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -106,7 +122,7 @@
 
 //usage:#define less_trivial_usage
 //usage:       "[-E" IF_FEATURE_LESS_REGEXP("I")IF_FEATURE_LESS_FLAGS("Mm")
-//usage:       "N" IF_FEATURE_LESS_TRUNCATE("S") "h~] [FILE]..."
+//usage:       "N" IF_FEATURE_LESS_TRUNCATE("S") IF_FEATURE_LESS_RAW("R") "h~] [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"
@@ -121,6 +137,9 @@
 //usage:        IF_FEATURE_LESS_TRUNCATE(
 //usage:     "\n        -S      Truncate long lines"
 //usage:        )
+//usage:        IF_FEATURE_LESS_RAW(
+//usage:     "\n        -R      Remove color escape codes in input"
+//usage:        )
 //usage:     "\n        -~      Suppress ~s displayed past EOF"
 
 #include <sched.h>  /* sched_yield() */
@@ -161,6 +180,7 @@ enum {
         FLAG_TILDE = 1 << 4,
         FLAG_I = 1 << 5,
         FLAG_S = (1 << 6) * ENABLE_FEATURE_LESS_TRUNCATE,
+        FLAG_R = (1 << 7) * ENABLE_FEATURE_LESS_RAW,
 /* hijack command line options variable for internal state vars */
         LESS_STATE_MATCH_BACKWARDS = 1 << 15,
 };
@@ -211,6 +231,9 @@ struct globals {
         regex_t pattern;
         smallint pattern_valid;
 #endif
+#if ENABLE_FEATURE_LESS_RAW
+        smallint in_escape;
+#endif
 #if ENABLE_FEATURE_LESS_ASK_TERMINAL
         smallint winsize_err;
 #endif
@@ -259,7 +282,6 @@ struct globals {
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         less_gets_pos = -1; \
         empty_line_marker = "~"; \
-        num_files = 1; \
         current_file = 1; \
         eof_error = 1; \
         terminated = 1; \
@@ -518,6 +540,26 @@ static void read_lines(void)
                                 *--p = '\0';
                                 continue;
                         }
+#if ENABLE_FEATURE_LESS_RAW
+                        if (option_mask32 & FLAG_R) {
+                                if (c == '\033')
+                                        goto discard;
+                                if (G.in_escape) {
+                                        if (isdigit(c)
+                                         || c == '['
+                                         || c == ';'
+                                         || c == 'm'
+                                        ) {
+ discard:
+                                                G.in_escape = (c != 'm');
+                                                readpos++;
+                                                continue;
+                                        }
+                                        /* Hmm, unexpected end of "ESC [ N ; N m" sequence */
+                                        G.in_escape = 0;
+                                }
+                        }
+#endif
                         {
                                 size_t new_last_line_pos = last_line_pos + 1;
                                 if (c == '\t') {
@@ -1849,11 +1891,29 @@ int less_main(int argc, char **argv)
          *     (used by some setups for manpage display)
          */
         getopt32(argv, "EMmN~I" IF_FEATURE_LESS_TRUNCATE("S") /*ignored:*/"s");
-        argc -= optind;
         argv += optind;
-        num_files = argc;
+        num_files = argc - optind;
         files = argv;
 
+        /* Tools typically pass LESS="FRSXMK".
+         * The options we don't understand are ignored. */
+        if (ENABLE_FEATURE_LESS_ENV) {
+                char *c = getenv("LESS");
+                if (c) while (*c) switch (*c++) {
+                case 'M':
+                        option_mask32 |= FLAG_M;
+                        break;
+                case 'R':
+                        option_mask32 |= FLAG_R;
+                        break;
+                case 'S':
+                        option_mask32 |= FLAG_S;
+                        break;
+                default:
+                        break;
+                }
+        }
+
         /* Another popular pager, most, detects when stdout
          * is not a tty and turns into cat. This makes sense. */
         if (!isatty(STDOUT_FILENO))
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 72f028ed3..29c800612 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -53,6 +53,15 @@
 #include "libbb.h"
 #include <mtd/mtd-user.h>
 
+/* Old headers call it MTD_MODE_RAW.
+ * FIXME: In kernel headers, MTD_FILE_MODE_RAW is not a define,
+ * it's an enum. How I can test for existence of an enum?
+ */
+#if !defined(MTD_FILE_MODE_RAW)
+# define MTD_FILE_MODE_RAW 3
+#endif
+
+
 #define IS_NANDDUMP  (ENABLE_NANDDUMP && (!ENABLE_NANDWRITE || (applet_name[4] == 'd')))
 #define IS_NANDWRITE (ENABLE_NANDWRITE && (!ENABLE_NANDDUMP || (applet_name[4] != 'd')))
 
diff --git a/miscutils/setfattr.c b/miscutils/setfattr.c
index f0ef227cb..12eebc56e 100644
--- a/miscutils/setfattr.c
+++ b/miscutils/setfattr.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SETFATTR
-//config:       bool "setfattr"
+//config:       bool "setfattr (3.6 kb)"
 //config:       default y
 //config:       help
 //config:       Set/delete extended attributes on files