2 files changed, 12 insertions, 10 deletions

diff --git a/editors/patch.c b/editors/patch.c
index cb25e4140..988021d77 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -372,10 +372,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         xmove_fd(xopen_stdin(argv[1]), STDIN_FILENO);
                 }
         }
-        if (argv[0]) {
-                oldname = xstrdup(argv[0]);
-                newname = xstrdup(argv[0]);
-        }
 
         // Loop through the lines in the patch
         for(;;) {
@@ -486,10 +482,10 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                 // or if new hunk is empty (zero context) after patching
                                 if (!strcmp(name, "/dev/null") || !(reverse ? oldsum : newsum)) {
                                         name = reverse ? newname : oldname;
-                                        empty++;
+                                        empty = 1;
                                 }
 
-                                // handle -p path truncation.
+                                // Handle -p path truncation.
                                 for (i = 0, s = name; *s;) {
                                         if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i)
                                                 break;
@@ -500,6 +496,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                         i++;
                                         name = s;
                                 }
+                                // If "patch FILE_TO_PATCH", completely ignore name from patch
+                                if (argv[0])
+                                        name = argv[0];
 
                                 if (empty) {
                                         // File is empty after the patches have been applied
diff --git a/editors/sed.c b/editors/sed.c
index a8c35388b..4c7f75521 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -113,7 +113,7 @@ typedef struct sed_cmd_s {
         int end_line;           /* 'sed 1,3p' 0 == one line only. -1 = last line ($). -2-N = +N */
         int end_line_orig;
 
-        FILE *sw_file;          /* File (sw) command writes to, -1 for none. */
+        FILE *sw_file;          /* File (sw) command writes to, NULL for none. */
         char *string;           /* Data string for (saicytb) commands. */
 
         unsigned which_match;   /* (s) Which match to replace (0 for all) */
@@ -179,7 +179,7 @@ static void sed_free_and_close_stuff(void)
                 sed_cmd_t *sed_cmd_next = sed_cmd->next;
 
                 if (sed_cmd->sw_file)
-                        xprint_and_close_file(sed_cmd->sw_file);
+                        fclose(sed_cmd->sw_file);
 
                 if (sed_cmd->beg_match) {
                         regfree(sed_cmd->beg_match);
@@ -426,8 +426,11 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
                 /* Write to file */
                 case 'w':
                 {
-                        char *temp;
-                        idx += parse_file_cmd(/*sed_cmd,*/ substr+idx, &temp);
+                        char *fname;
+                        idx += parse_file_cmd(/*sed_cmd,*/ substr+idx+1, &fname);
+                        sed_cmd->sw_file = xfopen_for_write(fname);
+                        sed_cmd->sw_last_char = '\n';
+                        free(fname);
                         break;
                 }
                 /* Ignore case (gnu exension) */