Changeset 1309 in kBuild for trunk/src/kmk/kmkbuiltin/cp.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.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin/cp.c

@@ -363 +363 @@
                 return err(1, "fts_open");
         for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
+                int copied = 0;
+
                 switch (curr->fts_info) {
                 case FTS_NS:
@@ -511 +513 @@
                             ((fts_options & FTS_COMFOLLOW) &&
                             curr->fts_level == 0)) {
-                                if (copy_file(curr, dne))
+                                if (copy_file(curr, dne, cp_changed_only, &copied))
                                         badcp = rval = 1;
                         } else {
@@ -558 +560 @@
                                         badcp = rval = 1;
                         } else {
-                                if (copy_file(curr, dne))
+                                if (copy_file(curr, dne, cp_changed_only, &copied))
                                         badcp = rval = 1;
                         }
@@ -569 +571 @@
                                         badcp = rval = 1;
                         } else {
-                                if (copy_file(curr, dne))
+                                if (copy_file(curr, dne, cp_changed_only, &copied))
                                         badcp = rval = 1;
                         }
                         break;
                 default:
-                        if (copy_file(curr, dne))
+                        if (copy_file(curr, dne, cp_changed_only, &copied))
                                 badcp = rval = 1;
                         break;
                 }
                 if (vflag && !badcp)
-                        (void)printf("%s -> %s\n", curr->fts_path, to.p_path);
+                        (void)printf(copied ? "%s -> %s\n" : "%s matches %s - not copied\n",
+                                     curr->fts_path, to.p_path);
         }
         if (errno)