1 files changed, 20 insertions, 7 deletions

diff --git a/editors/sed.c b/editors/sed.c
index 7af8f867a..6cf54afe9 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -61,6 +61,10 @@
 #include "libbb.h"
 #include "xregex.h"
 
+enum {
+        OPT_in_place = 1 << 0,
+};
+
 /* Each sed command turns into one of these structures. */
 typedef struct sed_cmd_s {
         /* Ordered by alignment requirements: currently 36 bytes on x86 */
@@ -938,8 +942,11 @@ static void process_files(void)
 
                 if (matched) {
                         /* once matched, "n,xxx" range is dead, disabling it */
-                        if (sed_cmd->beg_line > 0)
+                        if (sed_cmd->beg_line > 0
+                         && !(option_mask32 & OPT_in_place) /* but not for -i */
+                        ) {
                                 sed_cmd->beg_line = -2;
+                        }
                         sed_cmd->in_match = !(
                                 /* has the ending line come, or is this a single address command? */
                                 (sed_cmd->end_line ?
@@ -985,6 +992,8 @@ static void process_files(void)
                 }
 
                 /* actual sedding */
+                //bb_error_msg("pattern_space:'%s' next_line:'%s' cmd:%c",
+                //pattern_space, next_line, sed_cmd->cmd);
                 switch (sed_cmd->cmd) {
 
                 /* Print line number */
@@ -1111,10 +1120,16 @@ static void process_files(void)
                 {
                         int len;
                         /* If no next line, jump to end of script and exit. */
+                        /* http://www.gnu.org/software/sed/manual/sed.html:
+                         * "Most versions of sed exit without printing anything
+                         * when the N command is issued on the last line of
+                         * a file. GNU sed prints pattern space before exiting
+                         * unless of course the -n command switch has been
+                         * specified. This choice is by design."
+                         */
                         if (next_line == NULL) {
-                                free(next_line);
-                                next_line = NULL;
-                                goto discard_line;
+                                //goto discard_line;
+                                goto discard_commands; /* GNU behavior */
                         }
                         /* Append next_line, read new next_line. */
                         len = strlen(pattern_space);
@@ -1270,9 +1285,6 @@ static void add_cmd_block(char *cmdstr)
 int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sed_main(int argc UNUSED_PARAM, char **argv)
 {
-        enum {
-                OPT_in_place = 1 << 0,
-        };
         unsigned opt;
         llist_t *opt_e, *opt_f;
         int status = EXIT_SUCCESS;
@@ -1292,6 +1304,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
         opt_e = opt_f = NULL;
         opt_complementary = "e::f::" /* can occur multiple times */
                             "nn"; /* count -n */
+        /* -i must be first, to match OPT_in_place definition */
         opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,
                             &G.be_quiet); /* counter for -n */
         //argc -= optind;