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

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

@@ -77 +77 @@
  */
 
+//usage:#define diff_trivial_usage
+//usage:       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
+//usage:#define diff_full_usage "\n\n"
+//usage:       "Compare files line by line and output the differences between them.\n"
+//usage:       "This implementation supports unified diffs only.\n"
+//usage:     "\n    -a  Treat all files as text"
+//usage:     "\n    -b  Ignore changes in the amount of whitespace"
+//usage:     "\n    -B  Ignore changes whose lines are all blank"
+//usage:     "\n    -d  Try hard to find a smaller set of changes"
+//usage:     "\n    -i  Ignore case differences"
+//usage:     "\n    -L  Use LABEL instead of the filename in the unified header"
+//usage:     "\n    -N  Treat absent files as empty"
+//usage:     "\n    -q  Output only whether files differ"
+//usage:     "\n    -r  Recurse"
+//usage:     "\n    -S  Start with FILE when comparing directories"
+//usage:     "\n    -T  Make tabs line up by prefixing a tab when necessary"
+//usage:     "\n    -s  Report when two files are the same"
+//usage:     "\n    -t  Expand tabs to spaces in output"
+//usage:     "\n    -U  Output LINES lines of context"
+//usage:     "\n    -w  Ignore all whitespace"
+
 #include "libbb.h"
 
 #if 0
-//#define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
+# define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
 #else
-#define dbg_error_msg(...) ((void)0)
+# define dbg_error_msg(...) ((void)0)
 #endif
 
@@ -673 +694 @@
 static int diffreg(char *file[2])
 {
-    FILE *fp[2] = { stdin, stdin };
+    FILE *fp[2];
     bool binary = false, differ = false;
     int status = STATUS_SAME, i;
 
+    fp[0] = stdin;
+    fp[1] = stdin;
     for (i = 0; i < 2; i++) {
         int fd = open_or_warn_stdin(file[i]);
@@ -795 +818 @@
             if (r != 0 || !S_ISDIR(osb.st_mode)) {
                 /* other dir doesn't have similarly named
-                 * directory, don't recurse */
+                 * directory, don't recurse; return 1 upon
+                 * exit, just like diffutils' diff */
+                exit_status |= 1;
                 return SKIP;
             }
@@ -819 +844 @@
         list[i].len = strlen(p[i]);
         recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
-                         add_to_dirlist, skip_dir, &list[i], 0);
+                add_to_dirlist, skip_dir, &list[i], 0);
         /* Sort dl alphabetically.
          * GNU diff does this ignoring any number of trailing dots.
@@ -847 +872 @@
         pos = !dp[0] ? 1 : (!dp[1] ? -1 : strcmp(dp[0], dp[1]));
         k = pos > 0;
-        if (pos && !(option_mask32 & FLAG(N)))
+        if (pos && !(option_mask32 & FLAG(N))) {
             printf("Only in %s: %s\n", p[k], dp[k]);
-        else {
+            exit_status |= 1;
+        } else {
             char *fullpath[2], *path[2]; /* if -N */
 
@@ -950 +976 @@
         bb_error_msg_and_die("can't compare stdin to a directory");
 
+    /* Compare metadata to check if the files are the same physical file.
+     *
+     * Comment from diffutils source says:
+     * POSIX says that two files are identical if st_ino and st_dev are
+     * the same, but many file systems incorrectly assign the same (device,
+     * inode) pair to two distinct files, including:
+     * GNU/Linux NFS servers that export all local file systems as a
+     * single NFS file system, if a local device number (st_dev) exceeds
+     * 255, or if a local inode number (st_ino) exceeds 16777215.
+     */
+    if (ENABLE_DESKTOP
+     && stb[0].st_ino == stb[1].st_ino
+     && stb[0].st_dev == stb[1].st_dev
+     && stb[0].st_size == stb[1].st_size
+     && stb[0].st_mtime == stb[1].st_mtime
+     && stb[0].st_ctime == stb[1].st_ctime
+     && stb[0].st_mode == stb[1].st_mode
+     && stb[0].st_nlink == stb[1].st_nlink
+     && stb[0].st_uid == stb[1].st_uid
+     && stb[0].st_gid == stb[1].st_gid
+    ) {
+        /* files are physically the same; no need to compare them */
+        return STATUS_SAME;
+    }
+
     if (S_ISDIR(stb[0].st_mode) && S_ISDIR(stb[1].st_mode)) {
 #if ENABLE_FEATURE_DIFF_DIR