Merge branch 'busybox' into mergeFRP-5236-g7dff7f376

3 files changed, 24 insertions, 21 deletions

diff --git a/coreutils/install.c b/coreutils/install.c
index c0f1c538a..00f8be87e 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -244,6 +244,15 @@ int install_main(int argc, char **argv)
                         }
                 }
 
+                /* Set the user and group id */
+                /* (must be before chmod, or else chown may clear suid/gid bits) */
+                if ((opts & (OPT_OWNER|OPT_GROUP))
+                 && lchown(dest, uid, gid) == -1
+                ) {
+                        bb_perror_msg("can't change %s of %s", "ownership", dest);
+                        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) {
@@ -254,13 +263,6 @@ int install_main(int argc, char **argv)
                 if (use_default_selinux_context)
                         setdefaultfilecon(dest);
 #endif
-                /* Set the user and group id */
-                if ((opts & (OPT_OWNER|OPT_GROUP))
-                 && lchown(dest, uid, gid) == -1
-                ) {
-                        bb_perror_msg("can't change %s of %s", "ownership", dest);
-                        ret = EXIT_FAILURE;
-                }
  next:
                 if (ENABLE_FEATURE_CLEAN_UP && isdir)
                         free(dest);
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 1bcc74d3b..379c00cc6 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -490,9 +490,9 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
         /* bash builtin errors out on "printf '-%s-\n' foo",
          * coreutils-6.9 works. Both work with "printf -- '-%s-\n' foo".
          * We will mimic coreutils. */
-        if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
-                argv++;
-        if (!argv[1]) {
+        argv = skip_dash_dash(argv);
+
+        if (!argv[0]) {
                 if ((ENABLE_ASH_PRINTF || ENABLE_HUSH_PRINTF)
                  && applet_name[0] != 'p'
                 ) {
@@ -502,8 +502,8 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
         }
 
-        format = argv[1];
-        argv2 = argv + 2;
+        format = argv[0];
+        argv2 = argv + 1;
 
         conv_err = 0;
         do {
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 6edff59cc..6fd00f9f1 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -17,14 +17,15 @@
 //config:       default y
 //config:       help
 //config:       sleep is used to pause for a specified number of seconds.
-//config:       It comes in 3 versions:
+//config:       It comes in 2 versions:
 //config:       - small: takes one integer parameter
-//config:       - fancy: takes multiple integer arguments with suffixes:
-//config:               sleep 1d 2h 3m 15s
-//config:       - fancy with fractional numbers:
-//config:               sleep 2.3s 4.5h sleeps for 16202.3 seconds
-//config:       Last one is "the most compatible" with coreutils sleep,
-//config:       but it adds around 1k of code.
+//config:       - fancy:
+//config:               * takes multiple integer arguments with suffixes:
+//config:                       sleep 1d 2h 3m 15s
+//config:               * allows fractional numbers:
+//config:                       sleep 2.3s 4.5h sleeps for 16202.3 seconds
+//config:       fancy is more compatible with coreutils sleep, but it adds around
+//config:       1k of code.
 //config:
 //config:config FEATURE_FANCY_SLEEP
 //config:       bool "Enable multiple arguments and s/m/h/d suffixes"
@@ -71,8 +72,8 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
          * + we can't use bb_show_usage
          * + applet_name can be the name of the shell
          */
-        ++argv;
-        if (!*argv) {
+        argv = skip_dash_dash(argv);
+        if (!argv[0]) {
                 /* Without this, bare "sleep" in ash shows _ash_ --help */
                 /* (ash can be the "sh" applet as well, so check 2nd char) */
                 if (ENABLE_ASH_SLEEP && applet_name[1] != 'l') {