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

branches/3.3/mindi-busybox/libbb/copy_file.c

@@ -65 +65 @@
         return -1; /* error */
     }
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+    if (flags & FILEUTILS_RMDEST)
+        if (flags & FILEUTILS_VERBOSE)
+            printf("removed '%s'\n", dest);
+#endif
     return 1; /* ok (to try again) */
 }
@@ -211 +216 @@
     }
 
+    if (dest_exists) {
+        if (flags & FILEUTILS_UPDATE) {
+            if (source_stat.st_mtime <= dest_stat.st_mtime) {
+                return 0; /* source file must be newer */
+            }
+        }
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        if (flags & FILEUTILS_RMDEST) {
+            ovr = ask_and_unlink(dest, flags);
+            if (ovr <= 0)
+                return ovr;
+            dest_exists = 0;
+        }
+#endif
+    }
+
     if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK)) {
         int (*lf)(const char *oldpath, const char *newpath);
@@ -390 +411 @@
     }
 
+    if (flags & FILEUTILS_VERBOSE) {
+        printf("'%s' -> '%s'\n", source, dest);
+    }
+
     return retval;
 }