ash: fix for last commit

[oweals/busybox.git] / editors / patch.c

diff --git a/editors/patch.c b/editors/patch.c
index ea1fc097497dbab39a19b78b3797f706bf00ce98..81316fae3e72dc91c09ba7b1b6d7eb0a6f77af9a 100644 (file)
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -23,10 +23,10 @@
  */
 
 //config:config PATCH
-//config:      bool "patch"
+//config:      bool "patch (9.1 kb)"
 //config:      default y
 //config:      help
-//config:        Apply a unified diff formatted patch.
+//config:      Apply a unified diff formatted patch.
 
 //applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -247,7 +247,7 @@ static int apply_one_hunk(void)
                // Figure out which line of hunk to compare with next.  (Skip lines
                // of the hunk we'd be adding.)
                while (plist && *plist->data == "+-"[reverse]) {
-                       if (data && !strcmp(data, plist->data+1)) {
+                       if (data && strcmp(data, plist->data+1) == 0) {
                                if (!backwarn) {
                                        backwarn = TT.linenum;
                                        if (option_mask32 & FLAG_IGNORE) {
@@ -291,8 +291,9 @@ static int apply_one_hunk(void)
 
                for (;;) {
                        while (plist && *plist->data == "+-"[reverse]) {
-                               if (!strcmp(check->data, plist->data+1) &&
-                                   !backwarn) {
+                               if (strcmp(check->data, plist->data+1) == 0
+                                && !backwarn
+                               ) {
                                        backwarn = TT.linenum;
                                        if (option_mask32 & FLAG_IGNORE) {
                                                dummy_revert = 1;
@@ -491,7 +492,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                                // We're deleting oldname if new file is /dev/null (before -p)
                                // or if new hunk is empty (zero context) after patching
-                               if (!strcmp(name, "/dev/null") || !(reverse ? oldsum : newsum)) {
+                               if (strcmp(name, "/dev/null") == 0 || !(reverse ? oldsum : newsum)) {
                                        name = reverse ? newname : oldname;
                                        empty = 1;
                                }
@@ -527,7 +528,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                        struct stat statbuf;
 
                                        // If the old file was null, we're creating a new one.
-                                       if (!strcmp(oldname, "/dev/null") || !oldsum) {
+                                       if (strcmp(oldname, "/dev/null") == 0 || !oldsum) {
                                                printf("creating %s\n", name);
                                                s = strrchr(name, '/');
                                                if (s) {