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

trunk/src/kmk/kmkbuiltin/cat.c

@@ -78 +78 @@
 #endif
 
+#include "kmkbuiltin.h"
+
+
 int bflag, eflag, nflag, sflag, tflag, vflag;
 /*int rval;*/
 const char *filename;
 
-static int usage(void);
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
+
+static int usage(FILE *);
 static int scanfiles(char *argv[], int cooked);
 static int cook_cat(FILE *);
@@ -92 +103 @@
 
 int
-kmk_builtin_cat(int argc, char *argv[])
+kmk_builtin_cat(int argc, char *argv[], char **envp)
 {
         int ch, rc;
@@ -111 +122 @@
 #endif
 
-        while ((ch = getopt(argc, argv, "benstuv")) != -1)
+        while ((ch = getopt_long(argc, argv, "benstuv", long_options, NULL)) != -1)
                 switch (ch) {
                 case 'b':
@@ -134 +145 @@
                         vflag = 1;
                         break;
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argv += optind;
@@ -151 +167 @@
 
 static int
-usage(void)
-{
-        fprintf(stderr, "usage: cat [-benstuv] [file ...]\n");
+usage(FILE *fp)
+{
+        fprintf(fp, "usage: %s [-benstuv] [file ...]\n"
+                                "   or: %s --help\n"
+                                "   or: %s --version\n",
+                        g_progname, g_progname, g_progname);
         return 1;
 }