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

trunk/src/kmk/kmkbuiltin/rmdir.c

@@ -51 +51 @@
 #include <unistd.h>
 #include "getopt.h"
+#include "kmkbuiltin.h"
 
 #ifdef _MSC_VER
@@ -57 +58 @@
 
 static int rm_path(char *);
-static int usage(void);
+static int usage(FILE *);
 
 static int pflag;
@@ -66 +67 @@
 static struct option long_options[] =
 {
+    { "help",                       no_argument, 0, 262 },
     { "ignore-fail-on-non-empty",   no_argument, 0, 260 },
     { "ignore-fail-on-not-exist",   no_argument, 0, 261 },
     { "parents",                    no_argument, 0, 'p' },
     { "verbose",                    no_argument, 0, 'v' },
+    { "version",                    no_argument, 0, 263 },
     { 0, 0,     0, 0 },
 };
@@ -75 +78 @@
 
 int
-kmk_builtin_rmdir(int argc, char *argv[])
+kmk_builtin_rmdir(int argc, char *argv[], char **envp)
 {
         int ch, errors;
@@ -102 +105 @@
                         ignore_fail_on_not_exist = 1;
                         break;
+                case 262:
+                        return kbuild_version(argv[0]);
+                case 263:
+                        usage(stdout);
+                        return 0;
                 case '?':
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argc -= optind;
@@ -110 +118 @@
 
         if (argc == 0)
-                return /*usage()*/0;
+                return /*usage(stderr)*/0;
 
         for (errors = 0; *argv; argv++) {
@@ -181 +189 @@
 
 static int
-usage(void)
+usage(FILE *pf)
 {
-
-        (void)fprintf(stderr, "usage: rmdir [-pv --ignore-fail-on-non-empty --ignore-fail-on-not-exist] directory ...\n");
+        (void)fprintf(pf, "usage: %s [-pv --ignore-fail-on-non-empty --ignore-fail-on-not-exist] directory ...\n"
+                          "   or: %s --help\n"
+                          "   or: %s --version\n",
+                      g_progname, g_progname, g_progname);
         return 1;
 }