Merge branch 'busybox' into merge

6 files changed, 30 insertions, 33 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 2fc7d6102..1a273ff2e 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config AWK
 //config:       bool "awk (22 kb)"
 //config:       default y
diff --git a/editors/cmp.c b/editors/cmp.c
index ec86c0ce2..2a410fdec 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -6,10 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
-
 //config:config CMP
 //config:       bool "cmp (5.4 kb)"
 //config:       default y
@@ -17,10 +13,10 @@
 //config:       cmp is used to compare two files and returns the result
 //config:       to standard output.
 
-//kbuild:lib-$(CONFIG_CMP) += cmp.o
-
 //applet:IF_CMP(APPLET(cmp, BB_DIR_USR_BIN, BB_SUID_DROP))
 
+//kbuild:lib-$(CONFIG_CMP) += cmp.o
+
 //usage:#define cmp_trivial_usage
 //usage:       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
 //usage:#define cmp_full_usage "\n\n"
@@ -29,6 +25,9 @@
 //usage:     "\n                for all differing bytes"
 //usage:     "\n        -s      Quiet"
 
+/* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
+
 #include "libbb.h"
 
 static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
diff --git a/editors/diff.c b/editors/diff.c
index 1ff399ffb..beea3e618 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -12,7 +12,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * The following code uses an algorithm due to Harold Stone,
  * which finds a pair of longest identical subsequences in
@@ -75,7 +74,6 @@
  * 3*(number of k-candidates installed), typically about
  * 6n words for files of length n.
  */
-
 //config:config DIFF
 //config:       bool "diff (13 kb)"
 //config:       default y
@@ -97,10 +95,10 @@
 //config:       This option enables support for directory and subdirectory
 //config:       comparison.
 
-//kbuild:lib-$(CONFIG_DIFF) += diff.o
-
 //applet:IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP))
 
+//kbuild:lib-$(CONFIG_DIFF) += diff.o
+
 //usage:#define diff_trivial_usage
 //usage:       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
 //usage:#define diff_full_usage "\n\n"
diff --git a/editors/patch.c b/editors/patch.c
index 81316fae3..a51b7a502 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -21,7 +21,6 @@
  * -F fuzz (number, default 2)
  * [file] which file to patch
  */
-
 //config:config PATCH
 //config:       bool "patch (9.1 kb)"
 //config:       default y
diff --git a/editors/sed.c b/editors/sed.c
index e2c6690bb..bb2809d3c 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -12,7 +12,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 /* Code overview.
  *
  * Files are laid out to avoid unnecessary function declarations.  So for
@@ -29,7 +28,6 @@
  *
  * sed_main() is where external code calls into this, with a command line.
  */
-
 /* Supported features and commands in this version of sed:
  *
  * - comments ('#')
@@ -55,7 +53,6 @@
  * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html
  * http://sed.sourceforge.net/sedfaq3.html
  */
-
 //config:config SED
 //config:       bool "sed (12 kb)"
 //config:       default y
@@ -63,10 +60,10 @@
 //config:       sed is used to perform text transformations on a file
 //config:       or input from a pipeline.
 
-//kbuild:lib-$(CONFIG_SED) += sed.o
-
 //applet:IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP))
 
+//kbuild:lib-$(CONFIG_SED) += sed.o
+
 //usage:#define sed_trivial_usage
 //usage:       "[-i[SFX]] [-nrE] [-f FILE]... [-e CMD]... [FILE]...\n"
 //usage:       "or: sed [-i[SFX]] [-nrE] CMD [FILE]..."
@@ -356,10 +353,16 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
                 if (*my_str == '\\')
                         delimiter = *++pos;
                 next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
-                temp = copy_parsing_escapes(pos, next);
-                *regex = xzalloc(sizeof(regex_t));
-                xregcomp(*regex, temp, G.regex_type);
-                free(temp);
+                if (next != 0) {
+                        temp = copy_parsing_escapes(pos, next);
+                        G.previous_regex_ptr = *regex = xzalloc(sizeof(regex_t));
+                        xregcomp(*regex, temp, G.regex_type);
+                        free(temp);
+                } else {
+                        *regex = G.previous_regex_ptr;
+                        if (!G.previous_regex_ptr)
+                                bb_error_msg_and_die("no previous regexp");
+                }
                 /* Move position to next character after last delimiter */
                 pos += (next+1);
         }
diff --git a/editors/vi.c b/editors/vi.c
index 91e954a87..8393eb825 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -5,7 +5,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * Things To Do:
  *      EXINIT
@@ -19,7 +18,6 @@
  *      ":r !cmd"  and  "!cmd"  to filter text through an external command
  *      An "ex" line oriented mode- maybe using "cmdedit"
  */
-
 //config:config VI
 //config:       bool "vi (22 kb)"
 //config:       default y
@@ -224,24 +222,25 @@ enum {
  * See "Xterm Control Sequences"
  * http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
  */
+#define ESC "\033"
 /* Inverse/Normal text */
-#define ESC_BOLD_TEXT "\033[7m"
-#define ESC_NORM_TEXT "\033[0m"
+#define ESC_BOLD_TEXT ESC"[7m"
+#define ESC_NORM_TEXT ESC"[m"
 /* Bell */
 #define ESC_BELL "\007"
 /* Clear-to-end-of-line */
-#define ESC_CLEAR2EOL "\033[K"
+#define ESC_CLEAR2EOL ESC"[K"
 /* Clear-to-end-of-screen.
  * (We use default param here.
  * Full sequence is "ESC [ <num> J",
  * <num> is 0/1/2 = "erase below/above/all".)
  */
-#define ESC_CLEAR2EOS "\033[J"
+#define ESC_CLEAR2EOS ESC"[J"
 /* Cursor to given coordinate (1,1: top left) */
-#define ESC_SET_CURSOR_POS "\033[%u;%uH"
+#define ESC_SET_CURSOR_POS ESC"[%u;%uH"
 //UNUSED
 ///* Cursor up and down */
-//#define ESC_CURSOR_UP "\033[A"
+//#define ESC_CURSOR_UP   ESC"[A"
 //#define ESC_CURSOR_DOWN "\n"
 
 #if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK
@@ -696,14 +695,14 @@ int vi_main(int argc, char **argv)
         save_argc = argc;
         optind = 0;
         // "Save cursor, use alternate screen buffer, clear screen"
-        write1("\033[?1049h");
+        write1(ESC"[?1049h");
         while (1) {
                 edit_file(argv[optind]); /* param might be NULL */
                 if (++optind >= argc)
                         break;
         }
         // "Use normal screen buffer, restore cursor"
-        write1("\033[?1049l");
+        write1(ESC"[?1049l");
         //-----------------------------------------------------------
 
         return 0;
@@ -772,7 +771,7 @@ static void edit_file(char *fn)
 #if ENABLE_FEATURE_VI_ASK_TERMINAL
         if (G.get_rowcol_error /* TODO? && no input on stdin */) {
                 uint64_t k;
-                write1("\033[999;999H" "\033[6n");
+                write1(ESC"[999;999H" ESC"[6n");
                 fflush_all();
                 k = read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100);
                 if ((int32_t)k == KEYCODE_CURSOR_POS) {
@@ -4501,7 +4500,7 @@ static void crash_dummy()
                                 sleeptime = 0;  // how fast to type
                         }
                 }
-                strcat(readbuffer, "\033");
+                strcat(readbuffer, ESC);
         }
         readbuffer[0] = strlen(readbuffer + 1);
  cd1: