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

trunk/src/kmk/kmkbuiltin/install.c

@@ -81 +81 @@
 #endif
 
+#include "kmkbuiltin.h"
+
+
 extern void * setmode(const char *p);
 extern mode_t getmode(const void *bbox, mode_t omode);
@@ -117 +120 @@
 static mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 static const char *suffix = BACKUP_SUFFIX;
+
+static struct option long_options[] =
+{
+    { "help",                                           no_argument, 0, 261 },
+    { "version",                                        no_argument, 0, 262 },
+    { 0, 0,     0, 0 },
+};
+
 
 static int      copy(int, const char *, int, const char *, off_t);
@@ -129 +140 @@
 static int      trymmap(int);
 #endif
-static int      usage(void);
+static int      usage(FILE *);
 
 int
-kmk_builtin_install(int argc, char *argv[])
+kmk_builtin_install(int argc, char *argv[], char **envp)
 {
         struct stat from_sb, to_sb;
@@ -158 +169 @@
         iflags = 0;
         group = owner = NULL;
-        while ((ch = getopt(argc, argv, "B:bCcdf:g:Mm:o:pSsv")) != -1)
+        while ((ch = getopt_long(argc, argv, "B:bCcdf:g:Mm:o:pSsv", long_options, NULL)) != -1)
                 switch((char)ch) {
                 case 'B':
@@ -217 +228 @@
                         verbose = 1;
                         break;
+                case 261:
+                        usage(stdout);
+                        return 0;
+                case 262:
+                        return kbuild_version(argv[0]);
                 case '?':
                 default:
-                        return usage();
+                        return usage(stderr);
                 }
         argc -= optind;
@@ -227 +243 @@
         if (dostrip && dodir) {
                 warnx("-d and -s may not be specified together");
-                return usage();
+                return usage(stderr);
         }
 
         /* must have at least two arguments, except when creating directories */
         if (argc == 0 || (argc == 1 && !dodir))
-                return usage();
+                return usage(stderr);
 
         /* need to make a temp copy so we can compare stripped version */
@@ -292 +308 @@
         if (argc != 2) {
                 warnx("wrong number or types of arguments");
-                return usage();
+                return usage(stderr);
         }
 
@@ -927 +943 @@
  */
 static int
-usage()
-{
-        (void)fprintf(stderr,
-"usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
-"               [-o owner] file1 file2\n"
-"       install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
-"               [-o owner] file1 ... fileN directory\n"
-"       install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n");
+usage(FILE *pf)
+{
+        fprintf(stderr,
+"usage: %s [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
+"           [-o owner] file1 file2\n"
+"   or: %s [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
+"           [-o owner] file1 ... fileN directory\n"
+"   or: %s -d [-v] [-g group] [-m mode] [-o owner] directory ...\n"
+"   or: %s --help\n"
+"   or: %s --version\n",
+                        g_progname, g_progname, g_progname, g_progname, g_progname);
         return EX_USAGE;
 }