Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/editors/patch.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/editors/patch.c (modified) (18 diffs)

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

@@ -16 +16 @@
  *  Issues
  *   - Non-interactive
- *   - Patches must apply cleanly or the hunk will fail.
+ *   - Patches must apply cleanly or patch (not just one hunk) will fail.
  *   - Reject file isnt saved
- *   -
  */
 
 #include <getopt.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+
+#include "libbb.h"
 
 static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int lines_count)
@@ -33 +30 @@
     while (src_stream && (i < lines_count)) {
         char *line;
-        line = bb_get_line_from_file(src_stream);
+        line = xmalloc_fgets(src_stream);
         if (line == NULL) {
             break;
         }
         if (fputs(line, dest_stream) == EOF) {
-            bb_perror_msg_and_die("Error writing to new file");
+            bb_perror_msg_and_die("error writing to new file");
         }
         free(line);
@@ -44 +41 @@
         i++;
     }
-    return(i);
+    return i;
 }
 
@@ -59 +56 @@
 
     /* Terminate string at end of source filename */
-    temp = strchr(filename_start_ptr, '\t');
-    if (temp) *temp = 0;
-
-    /* skip over (patch_level) number of leading directories */
+    temp = strchrnul(filename_start_ptr, '\t');
+    *temp = '\0';
+
+    /* Skip over (patch_level) number of leading directories */
+    if (patch_level == -1)
+        patch_level = INT_MAX;
     for (i = 0; i < patch_level; i++) {
-        if(!(temp = strchr(filename_start_ptr, '/'))) break;
+        temp = strchr(filename_start_ptr, '/');
+        if (!temp)
+            break;
         filename_start_ptr = temp + 1;
     }
 
-    return(bb_xstrdup(filename_start_ptr));
+    return xstrdup(filename_start_ptr);
 }
 
@@ -74 +75 @@
 {
     struct stat statbuf;
-    return(stat(filename, &statbuf));
-}
-
+    return stat(filename, &statbuf);
+}
+
+int patch_main(int argc, char **argv);
 int patch_main(int argc, char **argv)
 {
@@ -86 +88 @@
     {
         char *p, *i;
-        ret = bb_getopt_ulflags(argc, argv, "p:i:", &p, &i);
+        ret = getopt32(argv, "p:i:", &p, &i);
         if (ret & 1)
-            patch_level = bb_xgetlarg(p, 10, -1, USHRT_MAX);
+            patch_level = xatol_range(p, -1, USHRT_MAX);
         if (ret & 2) {
-            patch_file = bb_xfopen(i, "r");
+            patch_file = xfopen(i, "r");
         } else {
             patch_file = stdin;
@@ -97 +99 @@
     }
 
-    patch_line = bb_get_line_from_file(patch_file);
+    patch_line = xmalloc_getline(patch_file);
     while (patch_line) {
         FILE *src_stream;
@@ -116 +118 @@
         while (patch_line && strncmp(patch_line, "--- ", 4) != 0) {
             free(patch_line);
-            patch_line = bb_get_line_from_file(patch_file);
-        }
+            patch_line = xmalloc_getline(patch_file);
+        }
+        /* FIXME: patch_line NULL check?? */
 
         /* Extract the filename used before the patch was generated */
@@ -123 +126 @@
         free(patch_line);
 
-        patch_line = bb_get_line_from_file(patch_file);
+        patch_line = xmalloc_getline(patch_file);
+        /* FIXME: NULL check?? */
         if (strncmp(patch_line, "+++ ", 4) != 0) {
             ret = 2;
-            bb_error_msg("Invalid patch");
+            bb_error_msg("invalid patch");
             continue;
         }
@@ -141 +145 @@
                 *line_ptr = '/';
             }
-            dst_stream = bb_xfopen(new_filename, "w+");
+            dst_stream = xfopen(new_filename, "w+");
             backup_filename = NULL;
         } else {
@@ -148 +152 @@
             strcat(backup_filename, ".orig");
             if (rename(new_filename, backup_filename) == -1) {
-                bb_perror_msg_and_die("Couldnt create file %s",
+                bb_perror_msg_and_die("cannot create file %s",
                         backup_filename);
             }
-            dst_stream = bb_xfopen(new_filename, "w");
+            dst_stream = xfopen(new_filename, "w");
         }
 
@@ -158 +162 @@
         } else {
             if (strcmp(original_filename, new_filename) == 0) {
-                src_stream = bb_xfopen(backup_filename, "r");
+                src_stream = xfopen(backup_filename, "r");
             } else {
-                src_stream = bb_xfopen(original_filename, "r");
+                src_stream = xfopen(original_filename, "r");
             }
         }
@@ -167 +171 @@
 
         /* Handle each hunk */
-        patch_line = bb_get_line_from_file(patch_file);
+        patch_line = xmalloc_fgets(patch_file);
         while (patch_line) {
             unsigned int count;
@@ -190 +194 @@
                 count = src_beg_line - src_cur_line;
                 if (copy_lines(src_stream, dst_stream, count) != count) {
-                    bb_error_msg_and_die("Bad src file");
+                    bb_error_msg_and_die("bad src file");
                 }
                 src_cur_line += count;
@@ -198 +202 @@
             hunk_offset_start = src_cur_line;
 
-            while ((patch_line = bb_get_line_from_file(patch_file)) != NULL) {
+            while ((patch_line = xmalloc_fgets(patch_file)) != NULL) {
                 if ((*patch_line == '-') || (*patch_line == ' ')) {
                     char *src_line = NULL;
                     if (src_stream) {
-                        src_line = bb_get_line_from_file(src_stream);
+                        src_line = xmalloc_fgets(src_stream);
                         if (!src_line) {
                             hunk_error++;
@@ -210 +214 @@
                         }
                         if (strcmp(src_line, patch_line + 1) != 0) {
-                            bb_error_msg("Hunk #%d FAILED at %d.", hunk_count, hunk_offset_start);
+                            bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
                             hunk_error++;
                             free(patch_line);
+                            /* Probably need to find next hunk, etc... */
+                            /* but for now we just bail out */
+                            patch_line = NULL;
                             break;
                         }
@@ -256 +263 @@
             if ((dest_cur_line == 0) || (dest_beg_line == 0)) {
                 /* The new patched file is empty, remove it */
-                if (unlink(new_filename) == -1) {
-                    bb_perror_msg_and_die("Couldnt remove file %s", new_filename);
-                }
-                if (unlink(original_filename) == -1) {
-                    bb_perror_msg_and_die("Couldnt remove original file %s", new_filename);
-                }
+                xunlink(new_filename);
+                if (strcmp(new_filename, original_filename) != 0)
+                    xunlink(original_filename);
             }
         }
@@ -270 +274 @@
      * 2 = More serious problems
      */
-    return(ret);
-}
+    return ret;
+}