3 files changed, 39 insertions, 26 deletions

diff --git a/editors/Config.in b/editors/Config.src
index 5f9566f0a..6cf21919c 100644
--- a/editors/Config.in
+++ b/editors/Config.src
@@ -7,14 +7,14 @@ menu "Editors"
 
 config AWK
         bool "awk"
-        default n
+        default y
         help
           Awk is used as a pattern scanning and processing language. This is
           the BusyBox implementation of that programming language.
 
 config FEATURE_AWK_LIBM
         bool "Enable math functions (requires libm)"
-        default n
+        default y
         depends on AWK
         help
           Enable math functions of the Awk programming language.
@@ -22,14 +22,14 @@ config FEATURE_AWK_LIBM
 
 config CMP
         bool "cmp"
-        default n
+        default y
         help
           cmp is used to compare two files and returns the result
           to standard output.
 
 config DIFF
         bool "diff"
-        default n
+        default y
         help
           diff compares two files or directories and outputs the
           differences between them in a form that can be given to
@@ -37,7 +37,7 @@ config DIFF
 
 config FEATURE_DIFF_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on DIFF && LONG_OPTS
         help
           Enable use of long options.
@@ -52,7 +52,7 @@ config FEATURE_DIFF_DIR
 
 config ED
         bool "ed"
-        default n
+        default y
         help
           The original 1970's Unix text editor, from the days of teletypes.
           Small, simple, evil. Part of SUSv3. If you're not already using
@@ -60,20 +60,20 @@ config ED
 
 config PATCH
         bool "patch"
-        default n
+        default y
         help
           Apply a unified diff formatted patch.
 
 config SED
         bool "sed"
-        default n
+        default y
         help
           sed is used to perform text transformations on a file
           or input from a pipeline.
 
 config VI
         bool "vi"
-        default n
+        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
@@ -91,7 +91,7 @@ config FEATURE_VI_MAX_LEN
 
 config FEATURE_VI_8BIT
         bool "Allow vi to display 8-bit chars (otherwise shows dots)"
-        default y
+        default n
         depends on VI
         help
           If your terminal can display characters with high bit set,
@@ -170,7 +170,7 @@ config FEATURE_VI_WIN_RESIZE
 
 config FEATURE_VI_ASK_TERMINAL
         bool "Use 'tell me cursor position' ESC sequence to measure window"
-        default n
+        default y
         depends on VI
         help
           If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
diff --git a/editors/Kbuild b/editors/Kbuild.src
index 76302aa76..76302aa76 100644
--- a/editors/Kbuild
+++ b/editors/Kbuild.src
diff --git a/editors/sed.c b/editors/sed.c
index 4bd6e0168..a5ef400fc 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -119,10 +119,10 @@ struct globals {
         } pipeline;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-void BUG_sed_globals_too_big(void);
+struct BUG_G_too_big {
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+};
 #define INIT_G() do { \
-        if (sizeof(struct globals) > COMMON_BUFSIZE) \
-                BUG_sed_globals_too_big(); \
         G.sed_cmd_tail = &G.sed_cmd_head; \
 } while (0)
 
@@ -385,7 +385,8 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
                         break;
                 /* Comment */
                 case '#':
-                        while (substr[++idx]) /*skip all*/;
+                        // while (substr[++idx]) continue;
+                        idx += strlen(substr + idx); // same
                         /* Fall through */
                 /* End of command */
                 case ';':
@@ -395,7 +396,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
                         bb_error_msg_and_die("bad option in substitution expression");
                 }
         }
-out:
+ out:
         /* compile the match string into a regex */
         if (*match != '\0') {
                 /* If match is empty, we use last regex used at runtime */
@@ -896,13 +897,32 @@ static void process_files(void)
 
                 /* Determine if this command matches this line: */
 
+                //bb_error_msg("match1:%d", sed_cmd->in_match);
+                //bb_error_msg("match2:%d", (!sed_cmd->beg_line && !sed_cmd->end_line
+                //              && !sed_cmd->beg_match && !sed_cmd->end_match));
+                //bb_error_msg("match3:%d", (sed_cmd->beg_line > 0
+                //      && (sed_cmd->end_line || sed_cmd->end_match
+                //          ? (sed_cmd->beg_line <= linenum)
+                //          : (sed_cmd->beg_line == linenum)
+                //          )
+                //      )
+                //bb_error_msg("match4:%d", (beg_match(sed_cmd, pattern_space)));
+                //bb_error_msg("match5:%d", (sed_cmd->beg_line == -1 && next_line == NULL));
+
                 /* Are we continuing a previous multi-line match? */
                 sed_cmd->in_match = sed_cmd->in_match
                         /* Or is no range necessary? */
                         || (!sed_cmd->beg_line && !sed_cmd->end_line
                                 && !sed_cmd->beg_match && !sed_cmd->end_match)
                         /* Or did we match the start of a numerical range? */
-                        || (sed_cmd->beg_line > 0 && (sed_cmd->beg_line <= linenum))
+                        || (sed_cmd->beg_line > 0
+                            && (sed_cmd->end_line || sed_cmd->end_match
+                                  /* note: even if end is numeric and is < linenum too,
+                                   * GNU sed matches! We match too */
+                                ? (sed_cmd->beg_line <= linenum)    /* N,end */
+                                : (sed_cmd->beg_line == linenum)    /* N */
+                                )
+                            )
                         /* Or does this line match our begin address regex? */
                         || (beg_match(sed_cmd, pattern_space))
                         /* Or did we match last line of input? */
@@ -976,7 +996,6 @@ static void process_files(void)
                 case 'P':
                 {
                         char *tmp = strchr(pattern_space, '\n');
-
                         if (tmp) {
                                 *tmp = '\0';
                                 /* TODO: explain why '\n' below */
@@ -999,11 +1018,8 @@ static void process_files(void)
                 case 'D':
                 {
                         char *tmp = strchr(pattern_space, '\n');
-
                         if (tmp) {
-                                tmp = xstrdup(tmp+1);
-                                free(pattern_space);
-                                pattern_space = tmp;
+                                overlapping_strcpy(pattern_space, tmp + 1);
                                 goto restart;
                         }
                 }
@@ -1048,7 +1064,6 @@ static void process_files(void)
                 case 'r':
                 {
                         FILE *rfile;
-
                         rfile = fopen_for_read(sed_cmd->string);
                         if (rfile) {
                                 char *line;
@@ -1097,12 +1112,11 @@ static void process_files(void)
                         int len;
                         /* If no next line, jump to end of script and exit. */
                         if (next_line == NULL) {
-                                /* Jump to end of script and exit */
                                 free(next_line);
                                 next_line = NULL;
                                 goto discard_line;
-                        /* append next_line, read new next_line. */
                         }
+                        /* Append next_line, read new next_line. */
                         len = strlen(pattern_space);
                         pattern_space = xrealloc(pattern_space, len + strlen(next_line) + 2);
                         pattern_space[len] = '\n';
@@ -1131,7 +1145,6 @@ static void process_files(void)
                 case 'y':
                 {
                         int i, j;
-
                         for (i = 0; pattern_space[i]; i++) {
                                 for (j = 0; sed_cmd->string[j]; j += 2) {
                                         if (pattern_space[i] == sed_cmd->string[j]) {