lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/install.c b/coreutils/install.c
index 69bf7dc553ca4da112c1004fa73c0858c3111eee..9dc90d6413ac16bdc20f4bf448d529de72174a82 100644 (file)
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2003 by Glenn McGrath
  * SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -50,7 +50,7 @@ static void setdefaultfilecon(const char *path)
 
        if (lsetfilecon(path, scontext) < 0) {
                if (errno != ENOTSUP) {
-                       bb_perror_msg("warning: failed to change context"
+                       bb_perror_msg("warning: can't change context"
                                        " of %s to %s", path, scontext);
                }
        }
@@ -101,12 +101,12 @@ int install_main(int argc, char **argv)
 #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
        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") */
-       opts = getopt32(argv, "cvb" "Ddpsg: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;
 
@@ -129,7 +129,7 @@ int install_main(int argc, char **argv)
        if (opts & OPT_PRESERVE_TIME) {
                copy_flags |= FILEUTILS_PRESERVE_STATUS;
        }
-       mode = 0666;
+       mode = 0755; /* GNU coreutils 6.10 compat */
        if (opts & OPT_MODE)
                bb_parse_mode(mode_str, &mode);
        uid = (opts & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
@@ -159,27 +159,36 @@ int install_main(int argc, char **argv)
                                goto next;
                        }
                } else {
-                       if (isdir)
-                               dest = concat_path_file(last, basename(arg));
                        if (opts & OPT_MKDIR_LEADING) {
-                               char *slash = strrchr(dest, '/');
-                               if (slash) {
-                                       *slash = '\0';
-                                       bb_make_directory(dest, 0755, FILEUTILS_RECUR);
-                                       /* errors are not checked. copy_file
-                                        * will fail if dir is not created. */
-                                       *slash = '/';
-                               }
+                               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 (copy_file(arg, dest, copy_flags)) {
+                       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 */
-               if ((opts & OPT_MODE) && chmod(dest, mode) == -1) {
+               /* 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;
                }
@@ -194,16 +203,6 @@ int install_main(int argc, char **argv)
                        bb_perror_msg("can't change %s of %s", "ownership", dest);
                        ret = EXIT_FAILURE;
                }
-               if (opts & 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:
                if (ENABLE_FEATURE_CLEAN_UP && isdir)
                        free(dest);