Changeset 1309 in kBuild for trunk/src/kmk/kmkbuiltin/cp_utils.c

Timestamp:

Dec 2, 2007 4:53:40 AM (17 years ago)

Author:

bird

Message:

combined the bulk of the cmp stuff into cmp_util.c. implemented cp --changed.

File:

• trunk/src/kmk/kmkbuiltin/cp_utils.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/cp_utils.c

@@ -54 +54 @@
 #include <sysexits.h>
 #include <unistd.h>
-
 #ifdef __sun__
 # include "solfakes.h"
 #endif
 #ifdef _MSC_VER
+# define MSC_DO_64_BIT_IO
 # include "mscfakes.h"
 #endif
-
 #include "cp_extern.h"
+#include "cmp_extern.h"
+
 #define cp_pct(x,y)     (int)(100.0 * (double)(x) / (double)(y))
 
@@ -76 +77 @@
 #endif
 
-int
-copy_file(const FTSENT *entp, int dne)
+
+int
+copy_file(const FTSENT *entp, int dne, int changed_only, int *pcopied)
 {
         static char buf[MAXBSIZE];
@@ -90 +92 @@
 #endif
 
+        *pcopied = 0;
+
         if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
                 warn("%s", entp->fts_path);
@@ -106 +110 @@
          */
         if (!dne) {
+                /* compare the files first if requested */
+                if (    changed_only
+                    &&  cmp_fd_and_file(from_fd, entp->fts_path, to.p_path,
+                                        1 /* silent */, 0 /* lflag */,
+                                        0 /* special */)
+                        == OK_EXIT) {
+                        return (0);
+                }
+
 #define YESNO "(y/n [n]) "
                 if (nflag) {
@@ -144 +157 @@
 
         rval = 0;
+        *pcopied = 1;
 
         /*