Merge branch 'busybox' into merge

7 files changed, 58 insertions, 30 deletions

diff --git a/coreutils/cat.c b/coreutils/cat.c
index fb735f994..65f0648f9 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -195,6 +195,7 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
 # define CAT_OPT_b (1<<1)
         if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */
                 struct number_state ns;
+                int exitcode;
 
                 ns.width = 6;
                 ns.start = 1;
@@ -203,10 +204,11 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
                 ns.empty_str = "\n";
                 ns.all = !(opts & CAT_OPT_b); /* -n without -b */
                 ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */
+                exitcode = EXIT_SUCCESS;
                 do {
-                        print_numbered_lines(&ns, *argv);
+                        exitcode |= print_numbered_lines(&ns, *argv);
                 } while (*++argv);
-                fflush_stdout_and_exit(EXIT_SUCCESS);
+                fflush_stdout_and_exit(exitcode);
         }
         /*opts >>= 2;*/
 #endif
diff --git a/coreutils/nl.c b/coreutils/nl.c
index c2f8b1042..2fdc9d85e 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -58,6 +58,8 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
                 "number-width\0"        Required_argument "w"
         ;
 #endif
+        int exitcode;
+
         ns.width = 6;
         ns.start = 1;
         ns.inc = 1;
@@ -72,9 +74,10 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
         if (!*argv)
                 *--argv = (char*)"-";
 
+        exitcode = EXIT_SUCCESS;
         do {
-                print_numbered_lines(&ns, *argv);
+                exitcode |= print_numbered_lines(&ns, *argv);
         } while (*++argv);
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit(exitcode);
 }
diff --git a/editors/awk.c b/editors/awk.c
index b9c8d2130..8e79d3159 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -1853,6 +1853,8 @@ static void handle_special(var *v)
 
         if (v == intvar[NF]) {
                 n = (int)getvar_i(v);
+                if (n < 0)
+                        syntax_error("NF set to negative value");
                 fsrealloc(n);
 
                 /* recalculate $0 */
diff --git a/editors/vi.c b/editors/vi.c
index 05d30f2ff..57fac59ad 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -255,8 +255,8 @@ enum {
         YANKDEL = TRUE,
         FORWARD = 1,    // code depends on "1"  for array index
         BACK = -1,      // code depends on "-1" for array index
-        LIMITED = 0,    // how much of text[] in char_search
-        FULL = 1,       // how much of text[] in char_search
+        LIMITED = 0,    // char_search() only current line
+        FULL = 1,       // char_search() to the end/beginning of entire text
 
         S_BEFORE_WS = 1,        // used in skip_thing() for moving "dot"
         S_TO_WS = 2,            // used in skip_thing() for moving "dot"
@@ -563,7 +563,7 @@ static void indicate_error(void);       // use flash or beep to indicate error
 static void Hit_Return(void);
 
 #if ENABLE_FEATURE_VI_SEARCH
-static char *char_search(char *, const char *, int, int);       // search for pattern starting at p
+static char *char_search(char *, const char *, int);    // search for pattern starting at p
 #endif
 #if ENABLE_FEATURE_VI_COLON
 static char *get_one_address(char *, int *);    // get colon addr, if present
@@ -940,7 +940,7 @@ static char *get_one_address(char *p, int *addr)	// get colon addr, if present
                 p = q;
                 if (*p == '/')
                         p++;
-                q = char_search(dot, pat, FORWARD, FULL);
+                q = char_search(dot, pat, (FORWARD << 1) | FULL);
                 if (q != NULL) {
                         *addr = count_lines(text, q);
                 }
@@ -1444,7 +1444,7 @@ static void colon(char *buf)
                         char *ls = q;           // orig line start
                         char *found;
  vc4:
-                        found = char_search(q, F, FORWARD, LIMITED);    // search cur line only for "find"
+                        found = char_search(q, F, (FORWARD << 1) | LIMITED);    // search cur line only for "find"
                         if (found) {
                                 uintptr_t bias;
                                 // we found the "find" pattern - delete it
@@ -1897,13 +1897,14 @@ static char *new_screen(int ro, int co)
 # if ENABLE_FEATURE_VI_REGEX_SEARCH
 
 // search for pattern starting at p
-static char *char_search(char *p, const char *pat, int dir, int range)
+static char *char_search(char *p, const char *pat, int dir_and_range)
 {
         struct re_pattern_buffer preg;
         const char *err;
         char *q;
         int i;
         int size;
+        int range;
 
         re_syntax_options = RE_SYNTAX_POSIX_EXTENDED;
         if (ignorecase)
@@ -1916,10 +1917,16 @@ static char *char_search(char *p, const char *pat, int dir, int range)
                 return p;
         }
 
-        // assume a LIMITED forward search
-        q = end - 1;
-        if (dir == BACK)
+        range = (dir_and_range & 1);
+        q = end - 1; // if FULL
+        if (range == LIMITED)
+                q = next_line(p);
+        if (dir_and_range < 0) { // BACK?
                 q = text;
+                if (range == LIMITED)
+                        q = prev_line(p);
+        }
+
         // RANGE could be negative if we are searching backwards
         range = q - p;
         q = p;
@@ -1942,7 +1949,7 @@ static char *char_search(char *p, const char *pat, int dir, int range)
         regfree(&preg);
         if (i < 0)
                 return NULL;
-        if (dir == FORWARD)
+        if (dir_and_range > 0) // FORWARD?
                 p = p + i;
         else
                 p = p - i;
@@ -1963,13 +1970,15 @@ static int mycmp(const char *s1, const char *s2, int len)
 #   define mycmp strncmp
 #  endif
 
-static char *char_search(char *p, const char *pat, int dir, int range)
+static char *char_search(char *p, const char *pat, int dir_and_range)
 {
         char *start, *stop;
         int len;
+        int range;
 
         len = strlen(pat);
-        if (dir == FORWARD) {
+        range = (dir_and_range & 1);
+        if (dir_and_range > 0) { //FORWARD?
                 stop = end - 1; // assume range is p..end-1
                 if (range == LIMITED)
                         stop = next_line(p);    // range is to next line
@@ -1978,7 +1987,7 @@ static char *char_search(char *p, const char *pat, int dir, int range)
                                 return start;
                         }
                 }
-        } else if (dir == BACK) {
+        } else { //BACK
                 stop = text;    // assume range is text..p
                 if (range == LIMITED)
                         stop = prev_line(p);    // range is to prev line
@@ -2357,7 +2366,7 @@ static void undo_push(char *src, unsigned int length, uint8_t u_type)	// Add to
         // Allocate a new undo object
         if (u_type == UNDO_DEL || u_type == UNDO_DEL_CHAIN) {
                 // For UNDO_DEL objects, save deleted text
-                if ((src + length) == end)
+                if ((text + length) == end)
                         length--;
                 // If this deletion empties text[], strip the newline. When the buffer becomes
                 // zero-length, a newline is added back, which requires this to compensate.
@@ -3865,7 +3874,7 @@ static void do_cmd(int c)
                                 p = dot - 1;
                         }
  dc4:
-                        q = char_search(p, last_search_pattern + 1, dir, FULL);
+                        q = char_search(p, last_search_pattern + 1, (dir << 1) | FULL);
                         if (q != NULL) {
                                 dot = q;        // good search, update "dot"
                                 msg = NULL;
@@ -3876,7 +3885,7 @@ static void do_cmd(int c)
                         if (dir == BACK) {
                                 p = end - 1;
                         }
-                        q = char_search(p, last_search_pattern + 1, dir, FULL);
+                        q = char_search(p, last_search_pattern + 1, (dir << 1) | FULL);
                         if (q != NULL) {        // found something
                                 dot = q;        // found new pattern- goto it
                                 msg = "search hit BOTTOM, continuing at TOP";
@@ -3892,13 +3901,13 @@ static void do_cmd(int c)
                 } while (--cmdcnt > 0);
                 break;
         case '{':                       // {- move backward paragraph
-                q = char_search(dot, "\n\n", BACK, FULL);
+                q = char_search(dot, "\n\n", (BACK << 1) | FULL);
                 if (q != NULL) {        // found blank line
                         dot = next_line(q);     // move to next blank line
                 }
                 break;
         case '}':                       // }- move forward paragraph
-                q = char_search(dot, "\n\n", FORWARD, FULL);
+                q = char_search(dot, "\n\n", (FORWARD << 1) | FULL);
                 if (q != NULL) {        // found blank line
                         dot = next_line(q);     // move to next blank line
                 }
diff --git a/include/libbb.h b/include/libbb.h
index 405c929a2..4ac749fd3 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1431,7 +1431,7 @@ struct number_state {
         const char *empty_str;
         smallint all, nonempty;
 };
-void print_numbered_lines(struct number_state *ns, const char *filename) FAST_FUNC;
+int print_numbered_lines(struct number_state *ns, const char *filename) FAST_FUNC;
 
 
 /* Networking */
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
index 9a8a51440..d6459d7c3 100644
--- a/libbb/print_numbered_lines.c
+++ b/libbb/print_numbered_lines.c
@@ -8,12 +8,16 @@
 
 #include "libbb.h"
 
-void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
+int FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
 {
         FILE *fp = fopen_or_warn_stdin(filename);
-        unsigned N = ns->start;
+        unsigned N;
         char *line;
 
+        if (!fp)
+                return EXIT_FAILURE;
+
+        N = ns->start;
         while ((line = xmalloc_fgetline(fp)) != NULL) {
                 if (ns->all
                  || (ns->nonempty && line[0])
@@ -27,4 +31,6 @@ void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filenam
         ns->start = N;
 
         fclose(fp);
+
+        return EXIT_SUCCESS;
 }
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 59d0d3ea8..13022b83e 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -37,12 +37,18 @@ char FAST_FUNC bb_process_escape_sequence(const char **ptr)
          * We treat \2 as a valid octal escape sequence. */
         do {
                 unsigned r;
-#if !WANT_HEX_ESCAPES
                 unsigned d = (unsigned char)(*q) - '0';
-#else
-                unsigned d = (unsigned char)_tolower(*q) - '0';
-                if (d >= 10)
-                        d += ('0' - 'a' + 10);
+#if WANT_HEX_ESCAPES
+                if (d >= 10) {
+                        d = (unsigned char)_tolower(*q) - 'a';
+                        //d += 10;
+                        /* The above would map 'A'-'F' and 'a'-'f' to 10-15,
+                         * however, some chars like '@' would map to 9 < base.
+                         * Do not allow that, map invalid chars to N > base:
+                         */
+                        if ((int)d >= 0)
+                                d += 10;
+                }
 #endif
                 if (d >= base) {
                         if (WANT_HEX_ESCAPES && base == 16) {