Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/editors/patch.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/editors/patch.c (modified) (7 diffs)

branches/3.3/mindi-busybox/editors/patch.c

@@ -346 +346 @@
 // state 2: In hunk: counting initial context lines
 // state 3: In hunk: getting body
+// Like GNU patch, we don't require a --- line before the +++, and
+// also allow the --- after the +++ line.
 
 int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -371 +373 @@
         }
     }
-    if (argv[0]) {
-        oldname = xstrdup(argv[0]);
-        newname = xstrdup(argv[0]);
-    }
 
     // Loop through the lines in the patch
@@ -413 +411 @@
 
         // Open a new file?
-        if (!strncmp("--- ", patchline, 4) || !strncmp("+++ ", patchline, 4)) {
+        if (is_prefixed_with(patchline, "--- ") || is_prefixed_with(patchline, "+++ ")) {
             char *s, **name = reverse ? &newname : &oldname;
             int i;
@@ -445 +443 @@
         // Start a new hunk?  Usually @@ -oldline,oldlen +newline,newlen @@
         // but a missing ,value means the value is 1.
-        } else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
+        } else if (state == 1 && is_prefixed_with(patchline, "@@ -")) {
             int i;
             char *s = patchline+4;
@@ -463 +461 @@
             state = 2;
 
+            // If the --- line is missing or malformed, either oldname
+            // or (for -R) newname could be NULL -- but not both.  Like
+            // GNU patch, proceed based on the +++ line, and avoid SEGVs.
+            if (!oldname)
+                oldname = xstrdup("MISSING_FILENAME");
+            if (!newname)
+                newname = xstrdup("MISSING_FILENAME");
+
             // If this is the first hunk, open the file.
             if (TT.filein == -1) {
@@ -477 +483 @@
                 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)
@@ -491 +497 @@
                     name = s;
                 }
+                // If "patch FILE_TO_PATCH", completely ignore name from patch
+                if (argv[0])
+                    name = argv[0];
 
                 if (empty) {