8 files changed, 66 insertions, 39 deletions

diff --git a/editors/Kbuild.src b/editors/Kbuild.src
index 9d4b9d053..98128064d 100644
--- a/editors/Kbuild.src
+++ b/editors/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
 lib-y:=
 
diff --git a/editors/awk.c b/editors/awk.c
index 83c5b47ce..f47d1ab02 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2002 by Dmitry Zakharov <dmit@crp.bank.gov.ua>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/editors/cmp.c b/editors/cmp.c
index dbfa4be35..f495da7d2 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2000,2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
diff --git a/editors/diff.c b/editors/diff.c
index a3ca2b660..83de52753 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -10,7 +10,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
@@ -479,7 +479,7 @@ start:
         for (; suff < nlen[0] - pref && suff < nlen[1] - pref &&
                nfile[0][nlen[0] - suff].value == nfile[1][nlen[1] - suff].value;
                suff++);
-        /* Arrays are pruned by the suffix and prefix lenght,
+        /* Arrays are pruned by the suffix and prefix length,
          * the result being sorted and stored in sfile[fileno],
          * and their sizes are stored in slen[fileno]
          */
diff --git a/editors/patch.c b/editors/patch.c
index eb16bca12..c40f54155 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -12,7 +12,6 @@
  * TODO:
  * -b backup
  * -l treat all whitespace as a single space
- * -N ignore already applied
  * -d chdir first
  * -D define wrap #ifdef and #ifndef around changes
  * -o outfile output here instead of in place
@@ -244,14 +243,12 @@ struct globals {
 } while (0)
 
 
-//bbox had: "p:i:RN"
 #define FLAG_STR "Rup:i:Nx"
 /* FLAG_REVERSE must be == 1! Code uses this fact. */
 #define FLAG_REVERSE (1 << 0)
 #define FLAG_u       (1 << 1)
 #define FLAG_PATHLEN (1 << 2)
 #define FLAG_INPUT   (1 << 3)
-// -N: not supported yet
 #define FLAG_IGNORE  (1 << 4)
 //non-standard:
 #define FLAG_DEBUG   (1 << 5)
@@ -314,6 +311,10 @@ static int apply_one_hunk(void)
 {
         struct double_list *plist, *buf = NULL, *check;
         int matcheof = 0, reverse = option_mask32 & FLAG_REVERSE, backwarn = 0;
+        /* Do we try "dummy" revert to check whether
+         * to silently skip this hunk? Used to implement -N.
+         */
+        int dummy_revert = 0;
 
         // Break doubly linked list so we can use singly linked traversal function.
         TT.current_hunk->prev->next = NULL;
@@ -343,9 +344,14 @@ static int apply_one_hunk(void)
                 while (plist && *plist->data == "+-"[reverse]) {
                         if (data && !strcmp(data, plist->data+1)) {
                                 if (!backwarn) {
+                                        backwarn++;
+                                        if (option_mask32 & FLAG_IGNORE) {
+                                                dummy_revert = 1;
+                                                reverse ^= 1;
+                                                continue;
+                                        }
                                         fdprintf(2,"Possibly reversed hunk %d at %ld\n",
                                                 TT.hunknum, TT.linenum);
-                                        backwarn++;
                                 }
                         }
                         plist = plist->next;
@@ -409,7 +415,7 @@ static int apply_one_hunk(void)
         }
 out:
         // We have a match.  Emit changed data.
-        TT.state = "-+"[reverse];
+        TT.state = "-+"[reverse ^ dummy_revert];
         llist_free(TT.current_hunk, do_line);
         TT.current_hunk = NULL;
         TT.state = 1;
@@ -441,10 +447,21 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         INIT_TT();
 
         opts = getopt32(argv, FLAG_STR, &opt_p, &opt_i);
+        argv += optind;
         reverse = opts & FLAG_REVERSE;
         TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
-        if (opts & FLAG_INPUT) TT.filepatch = xopen(opt_i, O_RDONLY);
         TT.filein = TT.fileout = -1;
+        if (opts & FLAG_INPUT) {
+                TT.filepatch = xopen_stdin(opt_i);
+        } else {
+                if (argv[0] && argv[1]) {
+                        TT.filepatch = xopen_stdin(argv[1]);
+                }
+        }
+        if (argv[0]) {
+                oldname = xstrdup(argv[0]);
+                newname = xstrdup(argv[0]);
+        }
 
         // Loop through the lines in the patch
         for(;;) {
@@ -492,18 +509,20 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                 state = 1;
                         }
 
-                        free(*name);
                         finish_oldfile();
 
-                        // Trim date from end of filename (if any).  We don't care.
-                        for (s = patchline+4; *s && *s!='\t'; s++)
-                                if (*s=='\\' && s[1]) s++;
-                        i = atoi(s);
-                        if (i>1900 && i<=1970)
-                                *name = xstrdup("/dev/null");
-                        else {
-                                *s = 0;
-                                *name = xstrdup(patchline+4);
+                        if (!argv[0]) {
+                                free(*name);
+                                // Trim date from end of filename (if any).  We don't care.
+                                for (s = patchline+4; *s && *s!='\t'; s++)
+                                        if (*s=='\\' && s[1]) s++;
+                                i = atoi(s);
+                                if (i>1900 && i<=1970)
+                                        *name = xstrdup("/dev/null");
+                                else {
+                                        *s = 0;
+                                        *name = xstrdup(patchline+4);
+                                }
                         }
 
                         // We defer actually opening the file because svn produces broken
diff --git a/editors/patch_bbox.c b/editors/patch_bbox.c
index 62477af16..78aa5fde8 100644
--- a/editors/patch_bbox.c
+++ b/editors/patch_bbox.c
@@ -1,22 +1,22 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  busybox patch applet to handle the unified diff format.
- *  Copyright (C) 2003 Glenn McGrath
+ * busybox patch applet to handle the unified diff format.
+ * Copyright (C) 2003 Glenn McGrath
  *
- *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- *  This applet is written to work with patches generated by GNU diff,
- *  where there is equivalent functionality busybox patch shall behave
- *  as per GNU patch.
+ * This applet is written to work with patches generated by GNU diff,
+ * where there is equivalent functionality busybox patch shall behave
+ * as per GNU patch.
  *
- *  There is a SUSv3 specification for patch, however it looks to be
- *  incomplete, it doesnt even mention unified diff format.
- *  http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
+ * There is a SUSv3 specification for patch, however it looks to be
+ * incomplete, it doesnt even mention unified diff format.
+ * http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
  *
- *  Issues
- *   - Non-interactive
- *   - Patches must apply cleanly or patch (not just one hunk) will fail.
- *   - Reject file isnt saved
+ * Issues
+ * - Non-interactive
+ * - Patches must apply cleanly or patch (not just one hunk) will fail.
+ * - Reject file isnt saved
  */
 
 #include "libbb.h"
diff --git a/editors/sed.c b/editors/sed.c
index 7d6e7e79f..8d9f7b25b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -10,7 +10,7 @@
  *
  * MAINTAINER: Rob Landley <rob@landley.net>
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 /* Code overview.
@@ -992,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 */
@@ -1118,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);
diff --git a/editors/vi.c b/editors/vi.c
index 73e095cf8..602fc61d9 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3,7 +3,7 @@
  * tiny vi.c: A small 'vi' clone
  * Copyright (C) 2000, 2001 Sterling Huxley <sterling@europa.com>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*