2 files changed, 40 insertions, 6 deletions

diff --git a/editors/ed.c b/editors/ed.c
index dfe0f1a77..209ce9942 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -18,7 +18,7 @@
 
 //applet:IF_ED(APPLET(ed, BB_DIR_BIN, BB_SUID_DROP))
 
-//usage:#define ed_trivial_usage "[-p PROMPT] [FILE]"
+//usage:#define ed_trivial_usage "[-p PROMPT] [-s] [FILE]"
 //usage:#define ed_full_usage ""
 
 #include "libbb.h"
@@ -71,6 +71,11 @@ struct globals {
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
+#define OPTION_STR "sp:"
+enum {
+        OPT_s = (1 << 0),
+};
+
 static int bad_nums(int num1, int num2, const char *for_what)
 {
         if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
@@ -458,7 +463,8 @@ static int readLines(const char *file, int num)
          * in the following format:
          * "%d\n", <number of bytes read>
          */
-        printf("%u\n", charCount);
+        if (!(option_mask32 & OPT_s))
+                printf("%u\n", charCount);
         return TRUE;
 }
 
@@ -510,7 +516,8 @@ static int writeLines(const char *file, int num1, int num2)
          * unless the -s option was specified, in the following format:
          * "%d\n", <number of bytes written>
          */
-        printf("%u\n", charCount);
+        if (!(option_mask32 & OPT_s))
+                printf("%u\n", charCount);
         return TRUE;
 }
 
@@ -1005,7 +1012,7 @@ int ed_main(int argc UNUSED_PARAM, char **argv)
         lines.prev = &lines;
 
         prompt = ""; /* no prompt by default */
-        getopt32(argv, "p:", &prompt);
+        getopt32(argv, OPTION_STR, &prompt);
         argv += optind;
 
         if (argv[0]) {
diff --git a/editors/sed.c b/editors/sed.c
index 73034438a..374830f3f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -100,6 +100,12 @@ enum {
         OPT_in_place = 1 << 0,
 };
 
+struct sed_FILE {
+        struct sed_FILE *next; /* Next (linked list, NULL terminated) */
+        const char *fname;
+        FILE *fp;
+};
+
 /* Each sed command turns into one of these structures. */
 typedef struct sed_cmd_s {
         /* Ordered by alignment requirements: currently 36 bytes on x86 */
@@ -157,6 +163,11 @@ struct globals {
         /* linked list of append lines */
         llist_t *append_head;
 
+        /* linked list of FILEs opened for 'w' and s///w'.
+         * Needed to handle duplicate fnames: sed '/a/w F;/b/w F'
+         */
+        struct sed_FILE *FILE_head;
+
         char *add_cmd_line;
 
         struct pipeline {
@@ -217,6 +228,22 @@ static void sed_free_and_close_stuff(void)
 void sed_free_and_close_stuff(void);
 #endif
 
+static FILE *sed_xfopen_w(const char *fname)
+{
+        struct sed_FILE **pp = &G.FILE_head;
+        struct sed_FILE *cur;
+        while ((cur = *pp) != NULL) {
+                if (strcmp(cur->fname, fname) == 0)
+                        return cur->fp;
+                pp = &cur->next;
+        }
+        *pp = cur = xzalloc(sizeof(*cur));
+        /*cur->next = NULL; - already is */
+        cur->fname = xstrdup(fname);
+        cur->fp = xfopen_for_write(fname);
+        return cur->fp;
+}
+
 /* If something bad happens during -i operation, delete temp file */
 
 static void cleanup_outname(void)
@@ -452,7 +479,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
                 {
                         char *fname;
                         idx += parse_file_cmd(/*sed_cmd,*/ substr+idx+1, &fname);
-                        sed_cmd->sw_file = xfopen_for_write(fname);
+                        sed_cmd->sw_file = sed_xfopen_w(fname);
                         sed_cmd->sw_last_char = '\n';
                         free(fname);
                         break;
@@ -567,7 +594,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                 }
                 cmdstr += parse_file_cmd(/*sed_cmd,*/ cmdstr, &sed_cmd->string);
                 if (sed_cmd->cmd == 'w') {
-                        sed_cmd->sw_file = xfopen_for_write(sed_cmd->string);
+                        sed_cmd->sw_file = sed_xfopen_w(sed_cmd->string);
                         sed_cmd->sw_last_char = '\n';
                 }
         }