- Remove unnecessary warning from libbb and move bb_wfopen_input near bb_wfopen

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

diff --git a/coreutils/install.c b/coreutils/install.c
index 84e60f93478e1f679e9c7cbfc73ac68a075dad06..74e1d9acd0db370742f167109c36836e693e899a 100644 (file)
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2003 by Glenn McGrath <bug1@optushome.com.au>
+ *  Copyright (C) 2003 by Glenn McGrath <bug1@iinet.net.au>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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"
@@ -39,6 +39,16 @@
 #define INSTALL_OPT_MODE  32
 #define INSTALL_OPT_OWNER  64
 
+static const struct option install_long_options[] = {
+       { "directory",  0,      NULL,   'd' },
+       { "preserve-timestamps",        0,      NULL,   'p' },
+       { "strip",      0,      NULL,   's' },
+       { "group",      0,      NULL,   'g' },
+       { "mode",       0,      NULL,   'm' },
+       { "owner",      0,      NULL,   'o' },
+       { 0,    0,      0,      0 }
+};
+
 extern int install_main(int argc, char **argv)
 {
        struct stat statbuf;
@@ -53,15 +63,11 @@ extern int install_main(int argc, char **argv)
        int flags;
        int i;
 
+       bb_applet_long_options = install_long_options;
+       bb_opt_complementally = "!s~d:d~s";
        /* -c exists for backwards compatability, its needed */
-       bb_opt_complementaly = "s~d:d~s";
        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;
@@ -105,7 +111,7 @@ extern int install_main(int argc, char **argv)
                }
                return(ret);
        }
-       
+
        cp_mv_stat2(argv[argc - 1], &statbuf, lstat);
        for (i = optind; i < argc - 1; i++) {
                unsigned char *dest;
@@ -126,15 +132,15 @@ extern int install_main(int argc, char **argv)
                /* Set the user and group id */
                if (lchown(dest, uid, gid) == -1) {
                        bb_perror_msg("cannot change ownership of %s", dest);
-                       ret = EXIT_FAILURE;                     
+                       ret = EXIT_FAILURE;
                }
                if (flags & INSTALL_OPT_STRIP) {
                        if (execlp("strip", "strip", dest, NULL) == -1) {
                                bb_error_msg("strip failed");
-                               ret = EXIT_FAILURE;                     
+                               ret = EXIT_FAILURE;
                        }
                }
        }
-       
+
        return(ret);
 }