Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge

Conflicts:
	coreutils/ls.c
	include/platform.h
	libbb/bb_basename.c

4 files changed, 107 insertions, 62 deletions

diff --git a/editors/diff.c b/editors/diff.c
index daa58af9b..8b1e92783 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -101,9 +101,9 @@
 #include "libbb.h"
 
 #if 0
-//#define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
+# define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
 #else
-#define dbg_error_msg(...) ((void)0)
+# define dbg_error_msg(...) ((void)0)
 #endif
 
 enum {                  /* print_status() and diffreg() return values */
diff --git a/editors/patch.c b/editors/patch.c
index a90252a03..6d3f319b0 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -239,7 +239,7 @@ static int apply_one_hunk(void)
         plist = TT.current_hunk;
         buf = NULL;
         if (reverse ? TT.oldlen : TT.newlen) for (;;) {
-                char *data = xmalloc_reads(TT.filein, NULL, NULL);
+                char *data = xmalloc_reads(TT.filein, NULL);
 
                 TT.linenum++;
 
diff --git a/editors/sed.c b/editors/sed.c
index 9ab758bd7..99e56ff52 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -14,49 +14,47 @@
  */
 
 /* Code overview.
+ *
+ * Files are laid out to avoid unnecessary function declarations.  So for
+ * example, every function add_cmd calls occurs before add_cmd in this file.
+ *
+ * add_cmd() is called on each line of sed command text (from a file or from
+ * the command line).  It calls get_address() and parse_cmd_args().  The
+ * resulting sed_cmd_t structures are appended to a linked list
+ * (G.sed_cmd_head/G.sed_cmd_tail).
+ *
+ * add_input_file() adds a FILE* to the list of input files.  We need to
+ * know all input sources ahead of time to find the last line for the $ match.
+ *
+ * process_files() does actual sedding, reading data lines from each input FILE *
+ * (which could be stdin) and applying the sed command list (sed_cmd_head) to
+ * each of the resulting lines.
+ *
+ * sed_main() is where external code calls into this, with a command line.
+ */
 
-  Files are laid out to avoid unnecessary function declarations.  So for
-  example, every function add_cmd calls occurs before add_cmd in this file.
-
-  add_cmd() is called on each line of sed command text (from a file or from
-  the command line).  It calls get_address() and parse_cmd_args().  The
-  resulting sed_cmd_t structures are appended to a linked list
-  (G.sed_cmd_head/G.sed_cmd_tail).
-
-  add_input_file() adds a FILE* to the list of input files.  We need to
-  know all input sources ahead of time to find the last line for the $ match.
-
-  process_files() does actual sedding, reading data lines from each input FILE *
-  (which could be stdin) and applying the sed command list (sed_cmd_head) to
-  each of the resulting lines.
-
-  sed_main() is where external code calls into this, with a command line.
-*/
-
-
-/*
-        Supported features and commands in this version of sed:
-
-         - comments ('#')
-         - address matching: num|/matchstr/[,num|/matchstr/|$]command
-         - commands: (p)rint, (d)elete, (s)ubstitue (with g & I flags)
-         - edit commands: (a)ppend, (i)nsert, (c)hange
-         - file commands: (r)ead
-         - backreferences in substitution expressions (\0, \1, \2...\9)
-         - grouped commands: {cmd1;cmd2}
-         - transliteration (y/source-chars/dest-chars/)
-         - pattern space hold space storing / swapping (g, h, x)
-         - labels / branching (: label, b, t, T)
-
-         (Note: Specifying an address (range) to match is *optional*; commands
-         default to the whole pattern space if no specific address match was
-         requested.)
-
-        Todo:
-         - Create a wrapper around regex to make libc's regex conform with sed
-
-        Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
-*/
+/* Supported features and commands in this version of sed:
+ *
+ * - comments ('#')
+ * - address matching: num|/matchstr/[,num|/matchstr/|$]command
+ * - commands: (p)rint, (d)elete, (s)ubstitue (with g & I flags)
+ * - edit commands: (a)ppend, (i)nsert, (c)hange
+ * - file commands: (r)ead
+ * - backreferences in substitution expressions (\0, \1, \2...\9)
+ * - grouped commands: {cmd1;cmd2}
+ * - transliteration (y/source-chars/dest-chars/)
+ * - pattern space hold space storing / swapping (g, h, x)
+ * - labels / branching (: label, b, t, T)
+ *
+ * (Note: Specifying an address (range) to match is *optional*; commands
+ * default to the whole pattern space if no specific address match was
+ * requested.)
+ *
+ * Todo:
+ * - Create a wrapper around regex to make libc's regex conform with sed
+ *
+ * Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
+ */
 
 //usage:#define sed_trivial_usage
 //usage:       "[-efinr] SED_CMD [FILE]..."
@@ -217,11 +215,16 @@ static void parse_escapes(char *dest, const char *string, int len, char from, ch
 
 static char *copy_parsing_escapes(const char *string, int len)
 {
+        const char *s;
         char *dest = xmalloc(len + 1);
 
-        parse_escapes(dest, string, len, 'n', '\n');
-        /* GNU sed also recognizes \t */
-        parse_escapes(dest, dest, strlen(dest), 't', '\t');
+        /* sed recognizes \n */
+        /* GNU sed also recognizes \t and \r */
+        for (s = "\nn\tt\rr"; *s; s += 2) {
+                parse_escapes(dest, string, len, s[1], s[0]);
+                string = dest;
+                len = strlen(dest);
+        }
         return dest;
 }
 
@@ -244,11 +247,13 @@ static int index_of_next_unescaped_regexp_delim(int delimiter, const char *str)
                 delimiter = -delimiter;
         }
 
-        for (; (ch = str[idx]); idx++) {
+        for (; (ch = str[idx]) != '\0'; idx++) {
                 if (bracket >= 0) {
-                        if (ch == ']' && !(bracket == idx - 1 || (bracket == idx - 2
-                                        && str[idx - 1] == '^')))
+                        if (ch == ']'
+                         && !(bracket == idx - 1 || (bracket == idx - 2 && str[idx - 1] == '^'))
+                        ) {
                                 bracket = -1;
+                        }
                 } else if (escaped)
                         escaped = 0;
                 else if (ch == '\\')
@@ -434,11 +439,47 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
  */
 static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
 {
+        static const char cmd_letters[] = "saicrw:btTydDgGhHlnNpPqx={}";
+        enum {
+                IDX_s = 0,
+                IDX_a,
+                IDX_i,
+                IDX_c,
+                IDX_r,
+                IDX_w,
+                IDX_colon,
+                IDX_b,
+                IDX_t,
+                IDX_T,
+                IDX_y,
+                IDX_d,
+                IDX_D,
+                IDX_g,
+                IDX_G,
+                IDX_h,
+                IDX_H,
+                IDX_l,
+                IDX_n,
+                IDX_N,
+                IDX_p,
+                IDX_P,
+                IDX_q,
+                IDX_x,
+                IDX_equal,
+                IDX_lbrace,
+                IDX_rbrace,
+                IDX_nul
+        };
+        struct chk { char chk[sizeof(cmd_letters)-1 == IDX_nul ? 1 : -1]; };
+
+        unsigned idx = strchrnul(cmd_letters, sed_cmd->cmd) - cmd_letters;
+
         /* handle (s)ubstitution command */
-        if (sed_cmd->cmd == 's')
+        if (idx == IDX_s) {
                 cmdstr += parse_subst_cmd(sed_cmd, cmdstr);
+        }
         /* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
-        else if (strchr("aic", sed_cmd->cmd)) {
+        else if (idx <= IDX_c) { /* a,i,c */
                 if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c')
                         bb_error_msg_and_die("only a beginning address can be specified for edit commands");
                 for (;;) {
@@ -454,8 +495,9 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                 /* "\anychar" -> "anychar" */
                 parse_escapes(sed_cmd->string, sed_cmd->string, strlen(cmdstr), '\0', '\0');
                 cmdstr += strlen(cmdstr);
+        }
         /* handle file cmds: (r)ead */
-        } else if (strchr("rw", sed_cmd->cmd)) {
+        else if (idx <= IDX_w) { /* r,w */
                 if (sed_cmd->end_line || sed_cmd->end_match)
                         bb_error_msg_and_die("command only uses one address");
                 cmdstr += parse_file_cmd(/*sed_cmd,*/ cmdstr, &sed_cmd->string);
@@ -463,8 +505,9 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                         sed_cmd->sw_file = xfopen_for_write(sed_cmd->string);
                         sed_cmd->sw_last_char = '\n';
                 }
+        }
         /* handle branch commands */
-        } else if (strchr(":btT", sed_cmd->cmd)) {
+        else if (idx <= IDX_T) { /* :,b,t,T */
                 int length;
 
                 cmdstr = skip_whitespace(cmdstr);
@@ -475,7 +518,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                 }
         }
         /* translation command */
-        else if (sed_cmd->cmd == 'y') {
+        else if (idx == IDX_y) {
                 char *match, *replace;
                 int i = cmdstr[0];
 
@@ -495,7 +538,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
         /* if it wasnt a single-letter command that takes no arguments
          * then it must be an invalid command.
          */
-        else if (strchr("dDgGhHlnNpPqx={}", sed_cmd->cmd) == 0) {
+        else if (idx >= IDX_nul) { /* not d,D,g,G,h,H,l,n,N,p,P,q,x,=,{,} */
                 bb_error_msg_and_die("unsupported command %c", sed_cmd->cmd);
         }
 
@@ -966,9 +1009,9 @@ static void process_files(void)
                         }
                         sed_cmd->in_match = !(
                                 /* has the ending line come, or is this a single address command? */
-                                (sed_cmd->end_line ?
-                                        sed_cmd->end_line == -1 ?
-                                                !next_line
+                                (sed_cmd->end_line
+                                        ? sed_cmd->end_line == -1
+                                                ? !next_line
                                                 : (sed_cmd->end_line <= linenum)
                                         : !sed_cmd->end_match
                                 )
diff --git a/editors/vi.c b/editors/vi.c
index 712af0326..9d74acc91 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -536,7 +536,6 @@ static void edit_file(char *fn)
 #define cur_line edit_file__cur_line
 #endif
         int c;
-        int size;
 #if ENABLE_FEATURE_VI_USE_SIGNALS
         int sig;
 #endif
@@ -545,7 +544,6 @@ static void edit_file(char *fn)
         rawmode();
         rows = 24;
         columns = 80;
-        size = 0;
         IF_FEATURE_VI_ASK_TERMINAL(G.get_rowcol_error =) query_screen_dimensions();
 #if ENABLE_FEATURE_VI_ASK_TERMINAL
         if (G.get_rowcol_error /* TODO? && no input on stdin */) {
@@ -1690,12 +1688,16 @@ static char *char_insert(char *p, char c) // insert the char c at 'p'
                         p = text_hole_delete(p, p);     // shrink buffer 1 char
                 }
         } else {
+#if ENABLE_FEATURE_VI_SETOPTS
                 // insert a char into text[]
                 char *sp;               // "save p"
+#endif
 
                 if (c == 13)
                         c = '\n';       // translate \r to \n
+#if ENABLE_FEATURE_VI_SETOPTS
                 sp = p;                 // remember addr of insert
+#endif
                 p += 1 + stupid_insert(p, c);   // insert the char
 #if ENABLE_FEATURE_VI_SETOPTS
                 if (showmatch && strchr(")]}", *sp) != NULL) {