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

trunk/src/kmk/kmkbuiltin/cmp.c

@@ -63 +63 @@
 #  define lseek _lseeki64
 # endif
-#endif 
+#endif
 #include <locale.h>
 
 #ifndef O_BINARY
 # define O_BINARY 0
-#endif 
+#endif
 
 /*#include "extern.h"*/
 
+#include "kmkbuiltin.h"
+
+
 static int      lflag, sflag;
+
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
 
 /* this is kind of ugly but its the simplest way to avoid namespace mess. */
@@ -81 +92 @@
 #else
 #include "cmp_regular_std.c"
-#endif 
-
-static int usage(void);
+#endif
+
+static int usage(FILE *);
 
 int
-kmk_builtin_cmp(int argc, char *argv[])
+kmk_builtin_cmp(int argc, char *argv[], char **envp)
 {
         struct stat sb1, sb2;
@@ -107 +118 @@
         optind = 0; /* init */
 
-        while ((ch = getopt(argc, argv, "ls")) != -1)
+        while ((ch = getopt_long(argc, argv, "ls", long_options, NULL)) != -1)
                 switch (ch) {
                 case 'l':               /* print all differences */
@@ -115 +126 @@
                         sflag = 1;
                         break;
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
                 case '?':
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argv += optind;
@@ -126 +142 @@
 
         if (argc < 2 || argc > 4)
-                return usage();
+                return usage(stderr);
 
         /* Backward compatibility -- handle "-" meaning stdin. */
@@ -161 +177 @@
                 skip1 = strtoll(argv[2], &ep, 0);
                 if (errno || ep == argv[2]) {
-                        rc = usage();
+                        rc = usage(stderr);
                         goto l_exit;
                 }
@@ -168 +184 @@
                         skip2 = strtoll(argv[3], &ep, 0);
                         if (errno || ep == argv[3]) {
-                                rc = usage();
+                                rc = usage(stderr);
                                 goto l_exit;
                         }
@@ -203 +219 @@
 
 static int
-usage(void)
+usage(FILE *fp)
 {
-
-        (void)fprintf(stderr,
-            "usage: cmp [-l | -s] file1 file2 [skip1 [skip2]]\n");
+    fprintf(fp, "usage: %s [-l | -s] file1 file2 [skip1 [skip2]]\n"
+                                "   or: %s --help\n"
+                                "   or: %s --version\n",
+                        g_progname, g_progname, g_progname);
         return(ERR_EXIT);
 }