Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/editors/patch.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/editors/patch.c (modified) (17 diffs)

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

@@ -16 +16 @@
  * -o outfile output here instead of in place
  * -r rejectfile write rejected hunks to this file
+ * --dry-run (regression!)
  *
  * -f force (no questions asked)
@@ -22 +23 @@
  */
 
-//applet:IF_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_PATCH) += patch.o
-
 //config:config PATCH
 //config:   bool "patch"
@@ -31 +28 @@
 //config:   help
 //config:     Apply a unified diff formatted patch.
+
+//applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_PATCH) += patch.o
 
 //usage:#define patch_trivial_usage
@@ -40 +41 @@
 //usage:     "\n    -R,--reverse        Reverse patch"
 //usage:     "\n    -N,--forward        Ignore already applied patches"
-//usage:     "\n    --dry-run       Don't actually change files"
+/*usage:     "\n    --dry-run       Don't actually change files" - TODO */
 //usage:     "\n    -E,--remove-empty-files Remove output files if they become empty"
 //usage:    )
@@ -50 +51 @@
 //usage:     "\n    -E  Remove output files if they become empty"
 //usage:    )
+/* -u "interpret as unified diff" is supported but not documented: this info is not useful for --help */
+/* -x "debug" is supported but does nothing */
 //usage:
 //usage:#define patch_example_usage
@@ -68 +71 @@
 // Free all the elements of a linked list
 // Call freeit() on each element before freeing it.
-static
-void dlist_free(struct double_list *list, void (*freeit)(void *data))
+static void dlist_free(struct double_list *list, void (*freeit)(void *data))
 {
     while (list) {
@@ -81 +83 @@
 
 // Add an entry before "list" element in (circular) doubly linked list
-static
-struct double_list *dlist_add(struct double_list **list, char *data)
+static struct double_list *dlist_add(struct double_list **list, char *data)
 {
     struct double_list *llist;
@@ -131 +132 @@
 #define FLAG_IGNORE  (1 << 4)
 #define FLAG_RMEMPTY (1 << 5)
-//non-standard:
-#define FLAG_DEBUG   (1 << 6)
+/* Enable this bit and use -x for debug output: */
+#define FLAG_DEBUG   (0 << 6)
 
 // Dispose of a line of input, either by writing it out or discarding it.
@@ -230 +231 @@
         if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
     }
-    matcheof = matcheof < TT.context;
+    matcheof = !matcheof || matcheof < TT.context;
 
     if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
@@ -239 +240 @@
     plist = TT.current_hunk;
     buf = NULL;
-    if (TT.context) for (;;) {
-        char *data = xmalloc_reads(TT.filein, NULL, NULL);
+    if (reverse ? TT.oldlen : TT.newlen) for (;;) {
+        char *data = xmalloc_reads(TT.filein, NULL);
 
         TT.linenum++;
@@ -353 +354 @@
     char *oldname = NULL, *newname = NULL;
     char *opt_p, *opt_i;
+    long oldlen = oldlen; /* for compiler */
+    long newlen = newlen; /* for compiler */
 
     INIT_TT();
@@ -392 +395 @@
                 dlist_add(&TT.current_hunk, patchline);
 
-                if (*patchline != '+') TT.oldlen--;
-                if (*patchline != '-') TT.newlen--;
+                if (*patchline != '+') oldlen--;
+                if (*patchline != '-') newlen--;
 
                 // Context line?
@@ -401 +404 @@
                 // If we've consumed all expected hunk lines, apply the hunk.
 
-                if (!TT.oldlen && !TT.newlen) state = apply_one_hunk();
+                if (!oldlen && !newlen) state = apply_one_hunk();
                 continue;
             }
@@ -448 +451 @@
             // Read oldline[,oldlen] +newline[,newlen]
 
-            TT.oldlen = TT.newlen = 1;
+            TT.oldlen = oldlen = TT.newlen = newlen = 1;
             TT.oldline = strtol(s, &s, 10);
-            if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
+            if (*s == ',') TT.oldlen = oldlen = strtol(s+1, &s, 10);
             TT.newline = strtol(s+2, &s, 10);
-            if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
+            if (*s == ',') TT.newlen = newlen = strtol(s+1, &s, 10);
+
+            if (oldlen < 1 && newlen < 1)
+                bb_error_msg_and_die("Really? %s", patchline);
 
             TT.context = 0;
@@ -462 +468 @@
                 char *name;
 
-                oldsum = TT.oldline + TT.oldlen;
-                newsum = TT.newline + TT.newlen;
+                oldsum = TT.oldline + oldlen;
+                newsum = TT.newline + newlen;
 
                 name = reverse ? oldname : newname;
@@ -469 +475 @@
                 // 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") || !(reverse ? oldsum : newsum)) {
                     name = reverse ? newname : oldname;
                     empty++;
@@ -476 +481 @@
 
                 // handle -p path truncation.
-                for (i=0, s = name; *s;) {
-                    if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break;
-                    if (*(s++)=='/') {
-                        name = s;
-                        i++;
-                    }
+                for (i = 0, s = name; *s;) {
+                    if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i)
+                        break;
+                    if (*s++ != '/')
+                        continue;
+                    while (*s == '/')
+                        s++;
+                    i++;
+                    name = s;
                 }