Changeset 1183 in kBuild for trunk/src/kmk/kmkbuiltin/rm.c

Timestamp:

Oct 5, 2007 10:16:46 PM (17 years ago)

Author:

bird

Message:

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

File:

• trunk/src/kmk/kmkbuiltin/rm.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/rm.c

@@ -72 +72 @@
 #endif
 
+#include "kmkbuiltin.h"
+
+
 #ifdef __EMX__
 #undef S_IFWHT
@@ -90 +93 @@
 
 static char *argv0;
+
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
 
 static int      check(char *, char *, struct stat *);
@@ -98 +109 @@
 static void     rm_tree(char **);
 #endif
-static int      usage(void);
+static int      usage(FILE *);
+
+
 
 /*
@@ -108 +121 @@
  */
 int
-kmk_builtin_rm(int argc, char *argv[])
+kmk_builtin_rm(int argc, char *argv[], char **envp)
 {
         int ch, rflag;
-        char *p;
-
-        /* reinitialize globals */
-        argv0 = argv[0];
-        dflag = eval = fflag = iflag = Pflag = vflag = Wflag = stdin_ok = 0;
-        uid = 0;
-
-        /* kmk: reset getopt and set program name. */
-        g_progname = argv[0];
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
-
-#if 0 /* kmk: we don't need this */
-        /*
-         * Test for the special case where the utility is called as
-         * "unlink", for which the functionality provided is greatly
-         * simplified.
-         */
-        if ((p = rindex(argv[0], '/')) == NULL)
-                p = argv[0];
-        else
-                ++p;
-        if (strcmp(p, "unlink") == 0) {
-                while (getopt(argc, argv, "") != -1)
-                        return usage();
-                argc -= optind;
-                argv += optind;
-                if (argc != 1)
-                        return usage();
-                rm_file(&argv[0]);
-                return eval;
-        }
-#else
-        (void)p;
-#endif
+
+        /* reinitialize globals */
+        argv0 = argv[0];
+        dflag = eval = fflag = iflag = Pflag = vflag = Wflag = stdin_ok = 0;
+        uid = 0;
+
+        /* kmk: reset getopt and set program name. */
+        g_progname = argv[0];
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+        optind = 0; /* init */
+
         Pflag = rflag = 0;
-        while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1)
+        while ((ch = getopt_long(argc, argv, "dfiPRrvW", long_options, NULL)) != -1)
                 switch(ch) {
                 case 'd':
@@ -182 +171 @@
                         break;
 #endif
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
+                case '?':
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argc -= optind;
@@ -191 +186 @@
                 if (fflag)
                         return (0);
-                return usage();
+                return usage(stderr);
         }
 
@@ -603 +598 @@
 
 static int
-usage(void)
-{
-
-        (void)fprintf(stderr, "%s\n%s\n",
-            "usage: rm [-f | -i] [-dPRrvW] file ...\n",
-            "       unlink file");
+usage(FILE *pf)
+{
+        fprintf(pf, "usage: %s [-f | -i] [-dPRrvW] file ...\n"
+                                "   or: %s --help\n"
+                                "   or: %s --version\n",
+                        g_progname, g_progname, g_progname);
         return EX_USAGE;
 }