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

trunk/src/kmk/kmkbuiltin/printf.c

@@ -67 +67 @@
 #endif
 
+#include "kmkbuiltin.h"
+
+
 #ifdef __GNUC__
 #define ESCAPE '\e'
@@ -72 +75 @@
 #define ESCAPE 033
 #endif
+
+
+static size_t   b_length;
+static char     *b_fmt;
+static int      rval;
+static char  **gargv;
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
 
 static void      conv_escape_str(char *, void (*)(int));
@@ -84 +100 @@
 static char     *mklong(const char *, int);
 static void      check_conversion(const char *, const char *);
-static void      usage(void);
+static int       usage(FILE *);
 
 static void     b_count(int);
 static void     b_output(int);
-static size_t   b_length;
-static char     *b_fmt;
-
-static int      rval;
-static char  **gargv;
 
 #ifdef BUILTIN          /* csh builtin */
@@ -127 +138 @@
 }
 
-int kmk_builtin_printf(int argc, char *argv[])
+int kmk_builtin_printf(int argc, char *argv[], char **envp)
 {
         char *fmt, *start;
@@ -152 +163 @@
 #endif
 
-        while ((ch = getopt(argc, argv, "")) != -1) {
+        while ((ch = getopt_long(argc, argv, "", long_options, NULL)) != -1) {
                 switch (ch) {
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
                 case '?':
                 default:
-                        usage();
-                        return 1;
+                        return usage(stderr);
                 }
         }
@@ -164 +179 @@
 
         if (argc < 1) {
-                usage();
-                return 1;
+                return usage(stderr);
         }
 
@@ -675 +689 @@
 }
 
-static void
-usage(void)
-{
-        (void)fprintf(stderr, "Usage: %s format [arg ...]\n", g_progname);
-}
+static int
+usage(FILE *pf)
+{
+        fprintf(pf, "usage: %s format [arg ...]\n"
+                                "   or: %s --help\n"
+                                "   or: %s --version\n",
+                        g_progname, g_progname, g_progname);
+        return 1;
+}