Changeset 1287 in kBuild for trunk/src/kmk/kmkbuiltin

Timestamp:

Nov 30, 2007 3:52:13 AM (17 years ago)

Author:

bird

Message:

Added --ignore-non-existing and --changed flags. (latter not implemented)

File:

• trunk/src/kmk/kmkbuiltin/cp.c (modified) (9 diffs)

trunk/src/kmk/kmkbuiltin/cp.c

@@ -74 +74 @@
 #include "getopt.h"
 
+#include "k/kDefs.h"
 #ifdef _MSC_VER
 # include "mscfakes.h"
@@ -101 +102 @@
 #endif
 
-#if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
+#if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
 # define IS_SLASH(ch)   ((ch) == '/' || (ch) == '\\')
 #else
@@ -122 +123 @@
 static int Rflag, rflag;
 volatile sig_atomic_t info;
+static int cp_ignore_non_existing, cp_changed_only;
 
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
@@ -129 +131 @@
     { "help",                                           no_argument, 0, 261 },
     { "version",                                        no_argument, 0, 262 },
+    { "ignore-non-existing",                            no_argument, 0, 263 },
+    { "changed",                                        no_argument, 0, 264 },
     { 0, 0,     0, 0 },
 };
@@ -155 +159 @@
         fflag = iflag = nflag = pflag = vflag = Rflag = rflag = 0;
         info = 0;
+        cp_ignore_non_existing = cp_changed_only = 0;
 
         /* reset getopt and set progname. */
@@ -215 +220 @@
                 case 262:
                         return kbuild_version(argv[0]);
+                case 263:
+                        cp_ignore_non_existing = 1;
+                        break;
+                case 264:
+                        cp_changed_only = 1;
+                        break;
                 default:
                         return usage(stderr);
@@ -354 +365 @@
                 switch (curr->fts_info) {
                 case FTS_NS:
+                        if (   cp_ignore_non_existing
+                            && curr->fts_errno == ENOENT) {
+                                if (vflag) {
+                                        warnx("%s: %s", curr->fts_path,
+                                              strerror(curr->fts_errno));
+                                }
+                                continue;
+                        }
                 case FTS_DNR:
                 case FTS_ERR:
@@ -395 +414 @@
                                 if (type != DIR_TO_DNE) {
                                         p = strrchr(curr->fts_path, '/');
-#if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
+#if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
                                         if (strrchr(curr->fts_path, '\\') > p)
                                             p = strrchr(curr->fts_path, '\\');
@@ -606 +625 @@
 usage(FILE *fp)
 {
-        fprintf(fp, "usage: %s [-R [-H | -L | -P]] [-f | -i | -n] [-pv] src target\n"
-                                "   or: %s [-R [-H | -L | -P]] [-f | -i | -n] [-pv] src1 ... srcN directory\n"
-                                "   or: %s --help\n"
-                                "   or: %s --version\n",
-                        g_progname, g_progname, g_progname, g_progname);
+        fprintf(fp, "usage: %s [options] src target\n"
+                    "   or: %s [options] src1 ... srcN directory\n"
+                    "   or: %s --help\n"
+                    "   or: %s --version\n"
+                    "\n"
+                    "Options:\n"
+                    "   -R  Recursive copy.\n"
+                    "   -H  Description. Only valid with -R.\n"
+                    "   -L  Description. Only valid with -R.\n"
+                    "   -P  Description. Only valid with -R\n"
+                    "   -f  Force. Overrides -i and -n.\n"
+                    "   -i  Iteractive. Overrides -n and -f.\n"
+                    "   -n  Don't overwrite any files. Overrides -i and -f.\n"
+                    "   --ignore-non-existing\n"
+                    "       Don't fail if the specified source file doesn't exist.\n"
+                    "   --changed\n"
+                    "       Only copy if changed (i.e. compare first). TODO.\n"
+                ,
+                g_progname, g_progname, g_progname, g_progname);
         return 1;
 }