Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/editors/diff.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/diff.c (modified) (7 diffs)

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

@@ -77 +77 @@
  */
 
+//config:config DIFF
+//config:   bool "diff"
+//config:   default y
+//config:   help
+//config:     diff compares two files or directories and outputs the
+//config:     differences between them in a form that can be given to
+//config:     the patch command.
+//config:
+//config:config FEATURE_DIFF_LONG_OPTIONS
+//config:   bool "Enable long options"
+//config:   default y
+//config:   depends on DIFF && LONG_OPTS
+//config:   help
+//config:     Enable use of long options.
+//config:
+//config:config FEATURE_DIFF_DIR
+//config:   bool "Enable directory support"
+//config:   default y
+//config:   depends on DIFF
+//config:   help
+//config:     This option enables support for directory and subdirectory
+//config:     comparison.
+
+//kbuild:lib-$(CONFIG_DIFF) += diff.o
+
+//applet:IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP))
+
 //usage:#define diff_trivial_usage
 //usage:       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
@@ -99 +126 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if 0
@@ -337 +365 @@
 
 struct line {
-    /* 'serial' is not used in the begining, so we reuse it
+    /* 'serial' is not used in the beginning, so we reuse it
      * to store line offsets, thus reducing memory pressure
      */
@@ -407 +435 @@
             int c = fgetc(ft->ft_fp);
             if (c == EOF) {
-                printf("\n\\ No newline at end of file\n");
+                puts("\n\\ No newline at end of file");
                 return;
             }
@@ -632 +660 @@
 
                 for (j = 0; j < 2; j++)
-                    for (k = v[j].a; k < v[j].b; k++)
-                        nonempty |= (ix[j][k+1] - ix[j][k] != 1);
+                    for (k = v[j].a; k <= v[j].b; k++)
+                        nonempty |= (ix[j][k] - ix[j][k - 1] != 1);
 
                 vec = xrealloc_vector(vec, 6, ++idx);
@@ -666 +694 @@
                 printf(",%d", (a < b) ? b - a + 1 : 0);
             }
-            printf(" @@\n");
+            puts(" @@");
             /*
              * Output changes in "unified" diff format--the old and new lines
@@ -714 +742 @@
             if (bb_copyfd_eof(fd, fd_tmp) < 0)
                 xfunc_die();
-            if (fd) /* Prevents closing of stdin */
+            if (fd != STDIN_FILENO)
                 close(fd);
             fd = fd_tmp;
+            xlseek(fd, 0, SEEK_SET);
         }
         fp[i] = fdopen(fd, "r");
     }
 
+    setup_common_bufsiz();
     while (1) {
         const size_t sz = COMMON_BUFSIZE / 2;