Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

8 files changed, 198 insertions, 174 deletions

diff --git a/editors/Config.src b/editors/Config.src
index 201ee6eb9..af1e1de5e 100644
--- a/editors/Config.src
+++ b/editors/Config.src
@@ -67,123 +67,6 @@ config SED
           sed is used to perform text transformations on a file
           or input from a pipeline.
 
-config VI
-        bool "vi"
-        default y
-        help
-          'vi' is a text editor. More specifically, it is the One True
-          text editor <grin>. It does, however, have a rather steep
-          learning curve. If you are not already comfortable with 'vi'
-          you may wish to use something else.
-
-config FEATURE_VI_MAX_LEN
-        int "Maximum screen width in vi"
-        range 256 16384
-        default 4096
-        depends on VI
-        help
-          Contrary to what you may think, this is not eating much.
-          Make it smaller than 4k only if you are very limited on memory.
-
-config FEATURE_VI_8BIT
-        bool "Allow vi to display 8-bit chars (otherwise shows dots)"
-        default n
-        depends on VI
-        help
-          If your terminal can display characters with high bit set,
-          you may want to enable this. Note: vi is not Unicode-capable.
-          If your terminal combines several 8-bit bytes into one character
-          (as in Unicode mode), this will not work properly.
-
-config FEATURE_VI_COLON
-        bool "Enable \":\" colon commands (no \"ex\" mode)"
-        default y
-        depends on VI
-        help
-          Enable a limited set of colon commands for vi. This does not
-          provide an "ex" mode.
-
-config FEATURE_VI_YANKMARK
-        bool "Enable yank/put commands and mark cmds"
-        default y
-        depends on VI
-        help
-          This will enable you to use yank and put, as well as mark in
-          busybox vi.
-
-config FEATURE_VI_SEARCH
-        bool "Enable search and replace cmds"
-        default y
-        depends on VI
-        help
-          Select this if you wish to be able to do search and replace in
-          busybox vi.
-
-config FEATURE_VI_USE_SIGNALS
-        bool "Catch signals"
-        default y
-        depends on VI
-        help
-          Selecting this option will make busybox vi signal aware. This will
-          make busybox vi support SIGWINCH to deal with Window Changes, catch
-          Ctrl-Z and Ctrl-C and alarms.
-
-config FEATURE_VI_DOT_CMD
-        bool "Remember previous cmd and \".\" cmd"
-        default y
-        depends on VI
-        help
-          Make busybox vi remember the last command and be able to repeat it.
-
-config FEATURE_VI_READONLY
-        bool "Enable -R option and \"view\" mode"
-        default y
-        depends on VI
-        help
-          Enable the read-only command line option, which allows the user to
-          open a file in read-only mode.
-
-config FEATURE_VI_SETOPTS
-        bool "Enable set-able options, ai ic showmatch"
-        default y
-        depends on VI
-        help
-          Enable the editor to set some (ai, ic, showmatch) options.
-
-config FEATURE_VI_SET
-        bool "Support for :set"
-        default y
-        depends on VI
-        help
-          Support for ":set".
-
-config FEATURE_VI_WIN_RESIZE
-        bool "Handle window resize"
-        default y
-        depends on VI
-        help
-          Make busybox vi behave nicely with terminals that get resized.
-
-config FEATURE_VI_ASK_TERMINAL
-        bool "Use 'tell me cursor position' ESC sequence to measure window"
-        default y
-        depends on VI
-        help
-          If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
-          this option makes vi perform a last-ditch effort to find it:
-          vi positions cursor to 999,999 and asks terminal to report real
-          cursor position using "ESC [ 6 n" escape sequence, then reads stdin.
-
-          This is not clean but helps a lot on serial lines and such.
-
-config FEATURE_VI_OPTIMIZE_CURSOR
-        bool "Optimize cursor movement"
-        default y
-        depends on VI
-        help
-          This will make the cursor movement faster, but requires more memory
-          and it makes the applet a tiny bit larger.
-
 config FEATURE_ALLOW_EXEC
         bool "Allow vi and awk to execute shell commands"
         default y
diff --git a/editors/Kbuild.src b/editors/Kbuild.src
index 2f23ae12f..8888cba12 100644
--- a/editors/Kbuild.src
+++ b/editors/Kbuild.src
@@ -12,4 +12,3 @@ lib-$(CONFIG_CMP)       += cmp.o
 lib-$(CONFIG_DIFF)      += diff.o
 lib-$(CONFIG_ED)        += ed.o
 lib-$(CONFIG_SED)       += sed.o
-lib-$(CONFIG_VI)        += vi.o
diff --git a/editors/awk.c b/editors/awk.c
index 9d38b1f88..7685546e5 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -10,8 +10,7 @@
 //usage:#define awk_trivial_usage
 //usage:       "[OPTIONS] [AWK_PROGRAM] [FILE]..."
 //usage:#define awk_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n        -v VAR=VAL      Set variable"
+//usage:       "        -v VAR=VAL      Set variable"
 //usage:     "\n        -F SEP          Use SEP as field separator"
 //usage:     "\n        -f FILE         Read program from FILE"
 
diff --git a/editors/cmp.c b/editors/cmp.c
index 3a0f5aa4f..fbe6b9753 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -14,7 +14,6 @@
 //usage:       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
 //usage:#define cmp_full_usage "\n\n"
 //usage:       "Compare FILE1 with FILE2 (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      Write the byte numbers (decimal) and values (octal)"
 //usage:     "\n                for all differing bytes"
 //usage:     "\n        -s      Quiet"
diff --git a/editors/diff.c b/editors/diff.c
index 8b1e92783..8c0a31f47 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -81,7 +81,6 @@
 //usage:#define diff_full_usage "\n\n"
 //usage:       "Compare files line by line and output the differences between them.\n"
 //usage:       "This implementation supports unified diffs only.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Treat all files as text"
 //usage:     "\n        -b      Ignore changes in the amount of whitespace"
 //usage:     "\n        -B      Ignore changes whose lines are all blank"
diff --git a/editors/patch.c b/editors/patch.c
index 6d3f319b0..ec5b8e7ad 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -15,22 +15,23 @@
  * -D define wrap #ifdef and #ifndef around changes
  * -o outfile output here instead of in place
  * -r rejectfile write rejected hunks to this file
+ * --dry-run (regression!)
  *
  * -f force (no questions asked)
  * -F fuzz (number, default 2)
  * [file] which file to patch
  */
 
-//applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_PATCH) += patch.o
-
 //config:config PATCH
 //config:       bool "patch"
 //config:       default y
 //config:       help
 //config:         Apply a unified diff formatted patch.
 
+//applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_PATCH) += patch.o
+
 //usage:#define patch_trivial_usage
 //usage:       "[OPTIONS] [ORIGFILE [PATCHFILE]]"
 //usage:#define patch_full_usage "\n\n"
@@ -39,7 +40,7 @@
 //usage:     "\n        -i,--input DIFF         Read DIFF instead of stdin"
 //usage:     "\n        -R,--reverse            Reverse patch"
 //usage:     "\n        -N,--forward            Ignore already applied patches"
-//usage:     "\n        --dry-run               Don't actually change files"
+/*usage:     "\n        --dry-run               Don't actually change files" - TODO */
 //usage:     "\n        -E,--remove-empty-files Remove output files if they become empty"
 //usage:        )
 //usage:        IF_NOT_LONG_OPTS(
@@ -49,6 +50,8 @@
 //usage:     "\n        -N      Ignore already applied patches"
 //usage:     "\n        -E      Remove output files if they become empty"
 //usage:        )
+/* -u "interpret as unified diff" is supported but not documented: this info is not useful for --help */
+/* -x "debug" is supported but does nothing */
 //usage:
 //usage:#define patch_example_usage
 //usage:       "$ patch -p1 < example.diff\n"
@@ -130,8 +133,8 @@ struct globals {
 #define FLAG_INPUT   (1 << 3)
 #define FLAG_IGNORE  (1 << 4)
 #define FLAG_RMEMPTY (1 << 5)
-//non-standard:
-#define FLAG_DEBUG   (1 << 6)
+/* Enable this bit and use -x for debug output: */
+#define FLAG_DEBUG   (0 << 6)
 
 // Dispose of a line of input, either by writing it out or discarding it.
 
diff --git a/editors/sed.c b/editors/sed.c
index 99e56ff52..5c4e9cc3b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -59,8 +59,7 @@
 //usage:#define sed_trivial_usage
 //usage:       "[-efinr] SED_CMD [FILE]..."
 //usage:#define sed_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n        -e CMD  Add CMD to sed commands to be executed"
+//usage:       "        -e CMD  Add CMD to sed commands to be executed"
 //usage:     "\n        -f FILE Add FILE contents to sed commands to be executed"
 //usage:     "\n        -i      Edit files in-place (else sends result to stdout)"
 //usage:     "\n        -n      Suppress automatic printing of pattern space"
diff --git a/editors/vi.c b/editors/vi.c
index 9d74acc91..deb471d04 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -21,11 +21,138 @@
  *      An "ex" line oriented mode- maybe using "cmdedit"
  */
 
+//config:config VI
+//config:       bool "vi"
+//config:       default y
+//config:       help
+//config:         'vi' is a text editor. More specifically, it is the One True
+//config:         text editor <grin>. It does, however, have a rather steep
+//config:         learning curve. If you are not already comfortable with 'vi'
+//config:         you may wish to use something else.
+//config:
+//config:config FEATURE_VI_MAX_LEN
+//config:       int "Maximum screen width in vi"
+//config:       range 256 16384
+//config:       default 4096
+//config:       depends on VI
+//config:       help
+//config:         Contrary to what you may think, this is not eating much.
+//config:         Make it smaller than 4k only if you are very limited on memory.
+//config:
+//config:config FEATURE_VI_8BIT
+//config:       bool "Allow vi to display 8-bit chars (otherwise shows dots)"
+//config:       default n
+//config:       depends on VI
+//config:       help
+//config:         If your terminal can display characters with high bit set,
+//config:         you may want to enable this. Note: vi is not Unicode-capable.
+//config:         If your terminal combines several 8-bit bytes into one character
+//config:         (as in Unicode mode), this will not work properly.
+//config:
+//config:config FEATURE_VI_COLON
+//config:       bool "Enable \":\" colon commands (no \"ex\" mode)"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Enable a limited set of colon commands for vi. This does not
+//config:         provide an "ex" mode.
+//config:
+//config:config FEATURE_VI_YANKMARK
+//config:       bool "Enable yank/put commands and mark cmds"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         This will enable you to use yank and put, as well as mark in
+//config:         busybox vi.
+//config:
+//config:config FEATURE_VI_SEARCH
+//config:       bool "Enable search and replace cmds"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Select this if you wish to be able to do search and replace in
+//config:         busybox vi.
+//config:
+//config:config FEATURE_VI_REGEX_SEARCH
+//config:       bool "Enable regex in search and replace"
+//config:       default n   # Uses GNU regex, which may be unavailable. FIXME
+//config:       depends on FEATURE_VI_SEARCH
+//config:       help
+//config:         Use extended regex search.
+//config:
+//config:config FEATURE_VI_USE_SIGNALS
+//config:       bool "Catch signals"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Selecting this option will make busybox vi signal aware. This will
+//config:         make busybox vi support SIGWINCH to deal with Window Changes, catch
+//config:         Ctrl-Z and Ctrl-C and alarms.
+//config:
+//config:config FEATURE_VI_DOT_CMD
+//config:       bool "Remember previous cmd and \".\" cmd"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Make busybox vi remember the last command and be able to repeat it.
+//config:
+//config:config FEATURE_VI_READONLY
+//config:       bool "Enable -R option and \"view\" mode"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Enable the read-only command line option, which allows the user to
+//config:         open a file in read-only mode.
+//config:
+//config:config FEATURE_VI_SETOPTS
+//config:       bool "Enable set-able options, ai ic showmatch"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Enable the editor to set some (ai, ic, showmatch) options.
+//config:
+//config:config FEATURE_VI_SET
+//config:       bool "Support for :set"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Support for ":set".
+//config:
+//config:config FEATURE_VI_WIN_RESIZE
+//config:       bool "Handle window resize"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         Make busybox vi behave nicely with terminals that get resized.
+//config:
+//config:config FEATURE_VI_ASK_TERMINAL
+//config:       bool "Use 'tell me cursor position' ESC sequence to measure window"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+//config:         this option makes vi perform a last-ditch effort to find it:
+//config:         vi positions cursor to 999,999 and asks terminal to report real
+//config:         cursor position using "ESC [ 6 n" escape sequence, then reads stdin.
+//config:
+//config:         This is not clean but helps a lot on serial lines and such.
+//config:
+//config:config FEATURE_VI_OPTIMIZE_CURSOR
+//config:       bool "Optimize cursor movement"
+//config:       default y
+//config:       depends on VI
+//config:       help
+//config:         This will make the cursor movement faster, but requires more memory
+//config:         and it makes the applet a tiny bit larger.
+
+//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_VI) += vi.o
+
 //usage:#define vi_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define vi_full_usage "\n\n"
 //usage:       "Edit FILE\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_VI_COLON(
 //usage:     "\n        -c      Initial command to run ($EXINIT also available)"
 //usage:        )
@@ -35,6 +162,10 @@
 //usage:     "\n        -H      Short help regarding available features"
 
 #include "libbb.h"
+/* Should be after libbb.h: on some systems regex.h needs sys/types.h: */
+#if ENABLE_FEATURE_VI_REGEX_SEARCH
+# include <regex.h>
+#endif
 
 /* the CRASHME code is unmaintained, and doesn't currently build */
 #define ENABLE_FEATURE_VI_CRASHME 0
@@ -53,9 +184,9 @@
 
 /* 0x9b is Meta-ESC */
 #if ENABLE_FEATURE_VI_8BIT
-#define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b)
+# define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b)
 #else
-#define Isprint(c) ((unsigned char)(c) >= ' ' && (unsigned char)(c) < 0x7f)
+# define Isprint(c) ((unsigned char)(c) >= ' ' && (unsigned char)(c) < 0x7f)
 #endif
 
 #endif
@@ -367,7 +498,6 @@ 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 int mycmp(const char *, const char *, int);      // string cmp based in "ignorecase"
 #endif
 #if ENABLE_FEATURE_VI_COLON
 static char *get_one_address(char *, int *);    // get colon addr, if present
@@ -1562,48 +1692,16 @@ static char *new_screen(int ro, int co)
 }
 
 #if ENABLE_FEATURE_VI_SEARCH
-static int mycmp(const char *s1, const char *s2, int len)
-{
-        if (ENABLE_FEATURE_VI_SETOPTS && ignorecase) {
-                return strncasecmp(s1, s2, len);
-        }
-        return strncmp(s1, s2, len);
-}
+
+# 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)
 {
-#ifndef REGEX_SEARCH
-        char *start, *stop;
-        int len;
-
-        len = strlen(pat);
-        if (dir == FORWARD) {
-                stop = end - 1; // assume range is p - end-1
-                if (range == LIMITED)
-                        stop = next_line(p);    // range is to next line
-                for (start = p; start < stop; start++) {
-                        if (mycmp(start, pat, len) == 0) {
-                                return start;
-                        }
-                }
-        } else if (dir == BACK) {
-                stop = text;    // assume range is text - p
-                if (range == LIMITED)
-                        stop = prev_line(p);    // range is to prev line
-                for (start = p - len; start >= stop; start--) {
-                        if (mycmp(start, pat, len) == 0) {
-                                return start;
-                        }
-                }
-        }
-        // pattern not found
-        return NULL;
-#else /* REGEX_SEARCH */
         char *q;
         struct re_pattern_buffer preg;
         int i;
-        int size, range;
+        int size;
 
         re_syntax_options = RE_SYNTAX_POSIX_EXTENDED;
         preg.translate = 0;
@@ -1626,7 +1724,7 @@ static char *char_search(char *p, const char *pat, int dir, int range)
         // RANGE could be negative if we are searching backwards
         range = q - p;
 
-        q = re_compile_pattern(pat, strlen(pat), &preg);
+        q = (char *)re_compile_pattern(pat, strlen(pat), (struct re_pattern_buffer *)&preg);
         if (q != 0) {
                 // The pattern was not compiled
                 status_line_bold("bad search pattern: \"%s\": %s", pat, q);
@@ -1660,8 +1758,53 @@ static char *char_search(char *p, const char *pat, int dir, int range)
                 p = p - i;
         }
         return p;
-#endif /* REGEX_SEARCH */
 }
+
+# else
+
+#  if ENABLE_FEATURE_VI_SETOPTS
+static int mycmp(const char *s1, const char *s2, int len)
+{
+        if (ignorecase) {
+                return strncasecmp(s1, s2, len);
+        }
+        return strncmp(s1, s2, len);
+}
+#  else
+#   define mycmp strncmp
+#  endif
+
+static char *char_search(char *p, const char *pat, int dir, int range)
+{
+        char *start, *stop;
+        int len;
+
+        len = strlen(pat);
+        if (dir == FORWARD) {
+                stop = end - 1; // assume range is p - end-1
+                if (range == LIMITED)
+                        stop = next_line(p);    // range is to next line
+                for (start = p; start < stop; start++) {
+                        if (mycmp(start, pat, len) == 0) {
+                                return start;
+                        }
+                }
+        } else if (dir == BACK) {
+                stop = text;    // assume range is text - p
+                if (range == LIMITED)
+                        stop = prev_line(p);    // range is to prev line
+                for (start = p - len; start >= stop; start--) {
+                        if (mycmp(start, pat, len) == 0) {
+                                return start;
+                        }
+                }
+        }
+        // pattern not found
+        return NULL;
+}
+
+# endif
+
 #endif /* FEATURE_VI_SEARCH */
 
 static char *char_insert(char *p, char c) // insert the char c at 'p'
@@ -2023,8 +2166,8 @@ static void show_help(void)
         "\n\tNamed buffers with \"x"
 #endif
 #if ENABLE_FEATURE_VI_READONLY
-        "\n\tReadonly if vi is called as \"view\""
-        "\n\tReadonly with -R command line arg"
+        //not implemented: "\n\tReadonly if vi is called as \"view\""
+        //redundant: usage text says this too: "\n\tReadonly with -R command line arg"
 #endif
 #if ENABLE_FEATURE_VI_SET
         "\n\tSome colon mode commands with \':\'"