- 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 9a1306746662b6355a6bc665481e69757f2c9417..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,20 +39,32 @@
 #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;
-       mode_t mode = 0755;
-       uid_t uid = -1;
-       gid_t gid = -1;
-       char *gid_str;
-       char *uid_str;
-       char *mode_str;
+       mode_t mode;
+       uid_t uid;
+       gid_t gid;
+       char *gid_str = "-1";
+       char *uid_str = "-1";
+       char *mode_str = "0755";
        int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
        int ret = EXIT_SUCCESS;
        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 */
        flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str);     /* 'a' must be 2nd */
 
@@ -60,43 +72,46 @@ extern int install_main(int argc, char **argv)
        if (flags & INSTALL_OPT_PRESERVE_TIME) {
                copy_flags |= FILEUTILS_PRESERVE_STATUS;
        }
-       if (flags & INSTALL_OPT_GROUP) {
-               gid = get_ug_id(gid_str, my_getgrnam);
-       }
-       if (flags & INSTALL_OPT_MODE) {
-               bb_parse_mode(mode_str, &mode);
-       }
-       if (flags & INSTALL_OPT_OWNER) {
-               uid = get_ug_id(uid_str, my_getpwnam);
-       }
+       bb_parse_mode(mode_str, &mode);
+       gid = get_ug_id(gid_str, my_getgrnam);
+       uid = get_ug_id(uid_str, my_getpwnam);
+       umask(0);
 
-       /* Create directories */
+       /* Create directories
+        * dont use bb_make_directory() as it cant change uid or gid
+        * perhaps bb_make_directory() should be improved.
+        */
        if (flags & INSTALL_OPT_DIRECTORY) {
-       
                for (argv += optind; *argv; argv++) {
-                       unsigned char *dir_name = *argv;
-                       unsigned char *argv_ptr;
-
-                       ret |= bb_make_directory(dir_name, mode, FILEUTILS_RECUR);
+                       char *old_argv_ptr = *argv + 1;
+                       char *argv_ptr;
                        do {
-                               argv_ptr = strrchr(dir_name, '/');
-
-                               /* Skip the "." and ".." directories */
-                               if ((dir_name[0] == '.') && ((dir_name[1] == '\0') || ((dir_name[1] == '.') && (dir_name[2] == '\0')))) {
-                                       break;
+                               argv_ptr = strchr(old_argv_ptr, '/');
+                               old_argv_ptr = argv_ptr;
+                               if (argv_ptr) {
+                                       *argv_ptr = '\0';
+                                       old_argv_ptr++;
                                }
-                               if (lchown(dir_name, uid, gid) == -1) {
-                                       bb_perror_msg("cannot change ownership of %s", argv_ptr);
-                                       ret |= EXIT_FAILURE;
+                               if (mkdir(*argv, mode) == -1) {
+                                       if (errno != EEXIST) {
+                                               bb_perror_msg("coulnt create %s", *argv);
+                                               ret = EXIT_FAILURE;
+                                               break;
+                                       }
+                               }
+                               else if (lchown(*argv, uid, gid) == -1) {
+                                       bb_perror_msg("cannot change ownership of %s", *argv);
+                                       ret = EXIT_FAILURE;
+                                       break;
                                }
                                if (argv_ptr) {
-                                       *argv_ptr = '\0';
+                                       *argv_ptr = '/';
                                }
-                       } while (argv_ptr);
+                       } while (old_argv_ptr);
                }
                return(ret);
        }
-       
+
        cp_mv_stat2(argv[argc - 1], &statbuf, lstat);
        for (i = optind; i < argc - 1; i++) {
                unsigned char *dest;
@@ -111,21 +126,21 @@ extern int install_main(int argc, char **argv)
                /* Set the file mode */
                if (chmod(dest, mode) == -1) {
                        bb_perror_msg("cannot change permissions of %s", dest);
-                       ret |= EXIT_FAILURE;
+                       ret = EXIT_FAILURE;
                }
 
                /* 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);
 }