Changeset 1183 for trunk/src/kmk/kmkbuiltin/mv.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/mv.c (modified) (8 diffs)

trunk/src/kmk/kmkbuiltin/mv.c

@@ -79 +79 @@
 #endif
 
-#if !defined(__FreeBSD__) && !defined(__APPLE__)
-extern void strmode(mode_t mode, char *p);
-#endif
+#include "kmkbuiltin.h"
+
 
 static int fflg, iflg, nflg, vflg;
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
 
 static int      do_move(char *, char *);
@@ -90 +96 @@
 static int      copy(char *, char *);
 #endif
-static int      usage(void);
+static int      usage(FILE *);
+
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
+extern void strmode(mode_t mode, char *p);
+#endif
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
@@ -115 +125 @@
 
 int
-kmk_builtin_mv(int argc, char *argv[])
+kmk_builtin_mv(int argc, char *argv[], char **envp)
 {
         size_t baselen, len;
@@ -134 +144 @@
         optind = 0; /* init */
 
-        while ((ch = getopt(argc, argv, "finv")) != -1)
+        while ((ch = getopt_long(argc, argv, "finv", long_options, NULL)) != -1)
                 switch (ch) {
                 case 'i':
@@ -151 +161 @@
                         vflg = 1;
                         break;
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argc -= optind;
@@ -158 +173 @@
 
         if (argc < 2)
-                return usage();
+                return usage(stderr);
 
         /*
@@ -166 +181 @@
         if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) {
                 if (argc > 2)
-                        return usage();
+                        return usage(stderr);
                 return do_move(argv[0], argv[1]);
         }
@@ -481 +496 @@
 
 static int
-usage(void)
-{
-
-        (void)fprintf(stderr, "%s\n%s\n",
-                      "usage: mv [-f | -i | -n] [-v] source target",
-                      "       mv [-f | -i | -n] [-v] source ... directory");
+usage(FILE *pf)
+{
+        fprintf(pf, "usage: %s [-f | -i | -n] [-v] source target\n"
+                                "   or: %s [-f | -i | -n] [-v] source ... directory\n"
+                                "   or: %s --help\n"
+                                "   or: %s --version\n");
         return EX_USAGE;
 }