Changeset 1183 for trunk/src/kmk/kmkbuiltin/cp.c

Timestamp:

Oct 6, 2007, 12:16:46 AM (18 years ago)

Author:

bird

Message:

Added --version and --help to all builtins.

File:

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

trunk/src/kmk/kmkbuiltin/cp.c

@@ -79 +79 @@
 #include "cp_extern.h"
 
+#include "kmkbuiltin.h"
+
+
 #ifndef S_IFWHT
 #define S_IFWHT 0
@@ -115 +118 @@
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
 
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
+
 static int copy(char *[], enum op, int);
 static int mastercmp(const FTSENT * const *, const FTSENT * const *);
@@ -120 +131 @@
 static void siginfo(int __unused);
 #endif
+static int usage(FILE *);
 
 int
-kmk_builtin_cp(int argc, char *argv[])
+kmk_builtin_cp(int argc, char *argv[], char **envp)
 {
         struct stat to_stat, tmp_stat;
@@ -145 +157 @@
 
         Hflag = Lflag = Pflag = 0;
-        while ((ch = getopt(argc, argv, "HLPRfinprv")) != -1)
+        while ((ch = getopt_long(argc, argv, "HLPRfinprv", long_options, NULL)) != -1)
                 switch (ch) {
                 case 'H':
@@ -191 +203 @@
                         vflag = 1;
                         break;
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argc -= optind;
@@ -198 +215 @@
 
         if (argc < 2)
-                return usage();
+                return usage(stderr);
 
         fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
@@ -270 +287 @@
                  */
                 if (argc > 1)
-                        return usage();
+                        return usage(stderr);
                 /*
                  * Need to detect the case:
@@ -573 +590 @@
 }
 #endif
+
+
+static int
+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);
+        return EX_USAGE;
+}