add "make help"

[oweals/busybox.git] / coreutils / install.c

diff --git a/coreutils/install.c b/coreutils/install.c
index 36dc1d61820978c6214a0187c9c46eac8e807fca..d0460412e0abc1d75962c671f4c82c5476b1f089 100644 (file)
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -23,10 +23,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h> /* struct option */
 
 #include "busybox.h"
 #include "libcoreutils/coreutils.h"
@@ -64,22 +64,17 @@ extern int install_main(int argc, char **argv)
        int i;
 
        bb_applet_long_options = install_long_options;
-       bb_opt_complementaly = "s~d:d~s";
+       bb_opt_complementally = "!s~d:d~s";
        /* -c exists for backwards compatability, its needed */
        flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str);     /* 'a' must be 2nd */
 
-       /* Check valid options were given */
-       if(flags & 0x80000000UL) {
-               bb_show_usage();
-       }
-
        /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
        if (flags & INSTALL_OPT_PRESERVE_TIME) {
                copy_flags |= FILEUTILS_PRESERVE_STATUS;
        }
        bb_parse_mode(mode_str, &mode);
-       gid = get_ug_id(gid_str, my_getgrnam);
-       uid = get_ug_id(uid_str, my_getpwnam);
+       gid = get_ug_id(gid_str, bb_xgetgrnam);
+       uid = get_ug_id(uid_str, bb_xgetpwnam);
        umask(0);
 
        /* Create directories