Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/install.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/install.c (modified) (9 diffs)

branches/2.2.9/mindi-busybox/coreutils/install.c

@@ -4 +4 @@
  * SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
- * TODO: -d option, need a way of recursively making directories and changing
- *           owner/group, will probably modify bb_make_directory(...)
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#include <libgen.h>
-#include <getopt.h> /* struct option */
 
 #include "libbb.h"
@@ -21 +15 @@
     "preserve-timestamps\0" No_argument       "p"
     "strip\0"               No_argument       "s"
-    "group\0"               No_argument       "g"
-    "mode\0"                No_argument       "m"
-    "owner\0"               No_argument       "o"
+    "group\0"               Required_argument "g"
+    "mode\0"                Required_argument "m"
+    "owner\0"               Required_argument "o"
 /* autofs build insists of using -b --suffix=.orig */
 /* TODO? (short option for --suffix is -S) */
@@ -57 +51 @@
     if (lsetfilecon(path, scontext) < 0) {
         if (errno != ENOTSUP) {
-            bb_perror_msg("warning: failed to change context of %s to %s", path, scontext);
+            bb_perror_msg("warning: can't change context"
+                    " of %s to %s", path, scontext);
         }
     }
@@ -67 +62 @@
 #endif
 
-int install_main(int argc, char **argv);
+int install_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int install_main(int argc, char **argv)
 {
@@ -79 +74 @@
     const char *mode_str;
     int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
-    int flags;
+    int opts;
+    int min_args = 1;
     int ret = EXIT_SUCCESS;
-    int isdir;
+    int isdir = 0;
 #if ENABLE_SELINUX
     security_context_t scontext;
@@ -90 +86 @@
         OPT_v             = 1 << 1,
         OPT_b             = 1 << 2,
-        OPT_DIRECTORY     = 1 << 3,
-        OPT_PRESERVE_TIME = 1 << 4,
-        OPT_STRIP         = 1 << 5,
-        OPT_GROUP         = 1 << 6,
-        OPT_MODE          = 1 << 7,
-        OPT_OWNER         = 1 << 8,
-#if ENABLE_SELINUX
-        OPT_SET_SECURITY_CONTEXT = 1 << 9,
-        OPT_PRESERVE_SECURITY_CONTEXT = 1 << 10,
+        OPT_MKDIR_LEADING = 1 << 3,
+        OPT_DIRECTORY     = 1 << 4,
+        OPT_PRESERVE_TIME = 1 << 5,
+        OPT_STRIP         = 1 << 6,
+        OPT_GROUP         = 1 << 7,
+        OPT_MODE          = 1 << 8,
+        OPT_OWNER         = 1 << 9,
+#if ENABLE_SELINUX
+        OPT_SET_SECURITY_CONTEXT = 1 << 10,
+        OPT_PRESERVE_SECURITY_CONTEXT = 1 << 11,
 #endif
     };
@@ -105 +102 @@
     applet_long_options = install_longopts;
 #endif
-    opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z");
+    opt_complementary = "s--d:d--s" IF_FEATURE_INSTALL_LONG_OPTIONS(IF_SELINUX(":Z--\xff:\xff--Z"));
     /* -c exists for backwards compatibility, it's needed */
     /* -v is ignored ("print name of each created directory") */
     /* -b is ignored ("make a backup of each existing destination file") */
-    flags = getopt32(argv, "cvb" "dpsg:m:o:" USE_SELINUX("Z:"),
-            &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext));
+    opts = getopt32(argv, "cvb" "Ddpsg:m:o:" IF_SELINUX("Z:"),
+            &gid_str, &mode_str, &uid_str IF_SELINUX(, &scontext));
     argc -= optind;
     argv += optind;
 
 #if ENABLE_SELINUX
-    if (flags & (OPT_PRESERVE_SECURITY_CONTEXT|OPT_SET_SECURITY_CONTEXT)) {
+    if (opts & (OPT_PRESERVE_SECURITY_CONTEXT|OPT_SET_SECURITY_CONTEXT)) {
         selinux_or_die();
         use_default_selinux_context = 0;
-        if (flags & OPT_PRESERVE_SECURITY_CONTEXT) {
+        if (opts & OPT_PRESERVE_SECURITY_CONTEXT) {
             copy_flags |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
         }
-        if (flags & OPT_SET_SECURITY_CONTEXT) {
+        if (opts & OPT_SET_SECURITY_CONTEXT) {
             setfscreatecon_or_die(scontext);
             copy_flags |= FILEUTILS_SET_SECURITY_CONTEXT;
@@ -128 +125 @@
 #endif
 
-    /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
-    if (flags & OPT_PRESERVE_TIME) {
+    /* preserve access and modification time, this is GNU behaviour,
+     * BSD only preserves modification time */
+    if (opts & OPT_PRESERVE_TIME) {
         copy_flags |= FILEUTILS_PRESERVE_STATUS;
     }
-    mode = 0666;
-    if (flags & OPT_MODE)
+    mode = 0755; /* GNU coreutils 6.10 compat */
+    if (opts & OPT_MODE)
         bb_parse_mode(mode_str, &mode);
-    uid = (flags & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
-    gid = (flags & OPT_GROUP) ? get_ug_id(gid_str, xgroup2gid) : getgid();
-    if (flags & (OPT_OWNER|OPT_GROUP))
-        umask(0);
-
-    /* Create directories
-     * don't use bb_make_directory() as it can't change uid or gid
-     * perhaps bb_make_directory() should be improved.
-     */
-    if (flags & OPT_DIRECTORY) {
-        while ((arg = *argv++) != NULL) {
-            char *slash = arg;
-            while (1) {
-                slash = strchr(slash + 1, '/');
-                if (slash)
-                    *slash = '\0';
-                if (mkdir(arg, mode | 0111) == -1) {
-                    if (errno != EEXIST) {
-                        bb_perror_msg("cannot create %s", arg);
-                        ret = EXIT_FAILURE;
-                        break;
-                    }
-                } /* dir was created, chown? */
-                else if ((flags & (OPT_OWNER|OPT_GROUP))
-                 && lchown(arg, uid, gid) == -1
-                ) {
-                    bb_perror_msg("cannot change ownership of %s", arg);
-                    ret = EXIT_FAILURE;
-                    break;
-                }
-                if (!slash)
-                    break;
-                *slash = '/';
-            }
-        }
-        return ret;
-    }
-
-    if (argc < 2)
+    uid = (opts & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
+    gid = (opts & OPT_GROUP) ? get_ug_id(gid_str, xgroup2gid) : getgid();
+
+    last = argv[argc - 1];
+    if (!(opts & OPT_DIRECTORY)) {
+        argv[argc - 1] = NULL;
+        min_args++;
+
+        /* coreutils install resolves link in this case, don't use lstat */
+        isdir = stat(last, &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode);
+    }
+
+    if (argc < min_args)
         bb_show_usage();
-
-    last = argv[argc - 1];
-    argv[argc - 1] = NULL;
-    /* coreutils install resolves link in this case, don't use lstat */
-    isdir = stat(last, &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode);
 
     while ((arg = *argv++) != NULL) {
         char *dest = last;
-        if (isdir)
-            dest = concat_path_file(last, basename(arg));
-        if (copy_file(arg, dest, copy_flags)) {
-            /* copy is not made */
-            ret = EXIT_FAILURE;
-            goto next;
-        }
-
-        /* Set the file mode */
-        if ((flags & OPT_MODE) && chmod(dest, mode) == -1) {
-            bb_perror_msg("cannot change permissions of %s", dest);
+        if (opts & OPT_DIRECTORY) {
+            dest = arg;
+            /* GNU coreutils 6.9 does not set uid:gid
+             * on intermediate created directories
+             * (only on last one) */
+            if (bb_make_directory(dest, 0755, FILEUTILS_RECUR)) {
+                ret = EXIT_FAILURE;
+                goto next;
+            }
+        } else {
+            if (opts & OPT_MKDIR_LEADING) {
+                char *ddir = xstrdup(dest);
+                bb_make_directory(dirname(ddir), 0755, FILEUTILS_RECUR);
+                /* errors are not checked. copy_file
+                 * will fail if dir is not created. */
+                free(ddir);
+            }
+            if (isdir)
+                dest = concat_path_file(last, bb_basename(arg));
+            if (copy_file(arg, dest, copy_flags) != 0) {
+                /* copy is not made */
+                ret = EXIT_FAILURE;
+                goto next;
+            }
+            if (opts & OPT_STRIP) {
+                char *args[4];
+                args[0] = (char*)"strip";
+                args[1] = (char*)"-p"; /* -p --preserve-dates */
+                args[2] = dest;
+                args[3] = NULL;
+                if (spawn_and_wait(args)) {
+                    bb_perror_msg("strip");
+                    ret = EXIT_FAILURE;
+                }
+            }
+        }
+
+        /* Set the file mode (always, not only with -m).
+         * GNU coreutils 6.10 is not affected by umask. */
+        if (chmod(dest, mode) == -1) {
+            bb_perror_msg("can't change %s of %s", "permissions", dest);
             ret = EXIT_FAILURE;
         }
@@ -201 +198 @@
 #endif
         /* Set the user and group id */
-        if ((flags & (OPT_OWNER|OPT_GROUP))
+        if ((opts & (OPT_OWNER|OPT_GROUP))
          && lchown(dest, uid, gid) == -1
         ) {
-            bb_perror_msg("cannot change ownership of %s", dest);
+            bb_perror_msg("can't change %s of %s", "ownership", dest);
             ret = EXIT_FAILURE;
-        }
-        if (flags & OPT_STRIP) {
-            char *args[3];
-            args[0] = (char*)"strip";
-            args[1] = dest;
-            args[2] = NULL;
-            if (spawn_and_wait(args)) {
-                bb_perror_msg("strip");
-                ret = EXIT_FAILURE;
-            }
         }
  next: