Merge branch 'busybox' into merge

4 files changed, 31 insertions, 89 deletions

diff --git a/coreutils/cp.c b/coreutils/cp.c
index ae60623d3..b26c0e954 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -114,7 +114,7 @@ int cp_main(int argc, char **argv)
 # endif
         );
 # if ENABLE_FEATURE_CP_REFLINK
-        BUILD_BUG_ON(OPT_reflink != FILEUTILS_REFLINK);
+        BUILD_BUG_ON((int)OPT_reflink != (int)FILEUTILS_REFLINK);
         if (flags & FILEUTILS_REFLINK) {
                 if (!reflink)
                         flags |= FILEUTILS_REFLINK_ALWAYS;
diff --git a/coreutils/ls.c b/coreutils/ls.c
index b0c543d28..9daa15470 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1018,7 +1018,15 @@ static void scan_and_display_dirs_recur(struct dnode **dn, int first)
                 subdnp = scan_one_dir((*dn)->fullname, &nfiles);
 #if ENABLE_DESKTOP
                 if (option_mask32 & (OPT_s|OPT_l)) {
-                        printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
+                        if (option_mask32 & OPT_h) {
+                                printf("total %-"HUMAN_READABLE_MAX_WIDTH_STR"s\n",
+                                        /* print size, no fractions, use suffixes */
+                                        make_human_readable_str(calculate_blocks(subdnp) * 1024,
+                                                                0, 0)
+                                );
+                        } else {
+                                printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
+                        }
                 }
 #endif
                 if (nfiles > 0) {
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 9b9581ca9..126665839 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -32,13 +32,6 @@
 //config:       depends on SLEEP
 //config:       help
 //config:       Allow sleep to pause for specified minutes, hours, and days.
-//config:
-//config:config FEATURE_FLOAT_SLEEP
-//config:       bool "Enable fractional arguments"
-//config:       default y
-//config:       depends on FEATURE_FANCY_SLEEP
-//config:       help
-//config:       Allow for fractional numeric parameters.
 
 /* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
 //applet:IF_SLEEP(APPLET(sleep, BB_DIR_BIN, BB_SUID_DROP))
@@ -66,89 +59,28 @@
 
 #include "libbb.h"
 
-#if ENABLE_FEATURE_FANCY_SLEEP || ENABLE_FEATURE_FLOAT_SLEEP
-static const struct suffix_mult sfx[] = {
-        { "s", 1 },
-        { "m", 60 },
-        { "h", 60*60 },
-        { "d", 24*60*60 },
-        { "", 0 }
-};
-#endif
-
 int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sleep_main(int argc UNUSED_PARAM, char **argv)
 {
-#if ENABLE_FEATURE_FLOAT_SLEEP
-        double duration;
-        struct timespec ts;
-#else
-        unsigned duration;
-#endif
+        duration_t duration;
 
         ++argv;
         if (!*argv)
                 bb_show_usage();
 
-#if ENABLE_FEATURE_FLOAT_SLEEP
-
-# if ENABLE_LOCALE_SUPPORT
+#if ENABLE_FEATURE_FANCY_SLEEP
+# if ENABLE_FLOAT_DURATION
         /* undo busybox.c setlocale */
         setlocale(LC_NUMERIC, "C");
 # endif
         duration = 0;
         do {
-                char *arg = *argv;
-                if (strchr(arg, '.')) {
-                        double d;
-                        char *pp;
-                        int len = strspn(arg, "0123456789.");
-                        char sv = arg[len];
-                        arg[len] = '\0';
-                        errno = 0;
-                        d = strtod(arg, &pp);
-                        if (errno || *pp)
-                                bb_show_usage();
-                        arg += len;
-                        *arg-- = sv;
-                        sv = *arg;
-                        *arg = '1';
-                        duration += d * xatoul_sfx(arg, sfx);
-                        *arg = sv;
-                } else {
-                        duration += xatoul_sfx(arg, sfx);
-                }
+                duration += parse_duration_str(*argv);
         } while (*++argv);
-
-        ts.tv_sec = MAXINT(typeof(ts.tv_sec));
-        ts.tv_nsec = 0;
-        if (duration >= 0 && duration < ts.tv_sec) {
-                ts.tv_sec = duration;
-                ts.tv_nsec = (duration - ts.tv_sec) * 1000000000;
-        }
-        do {
-                errno = 0;
-                nanosleep(&ts, &ts);
-        } while (errno == EINTR);
-
-#elif ENABLE_FEATURE_FANCY_SLEEP
-
-        duration = 0;
-        do {
-                duration += xatou_range_sfx(*argv, 0, UINT_MAX - duration, sfx);
-        } while (*++argv);
-        sleep(duration);
-
+        sleep_for_duration(duration);
 #else /* simple */
-
         duration = xatou(*argv);
         sleep(duration);
-        // Off. If it's really needed, provide example why
-        //if (sleep(duration)) {
-        //      bb_perror_nomsg_and_die();
-        //}
-
 #endif
-
         return EXIT_SUCCESS;
 }
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index c1be7b198..3b2140807 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -39,10 +39,10 @@
 //kbuild:lib-$(CONFIG_TIMEOUT) += timeout.o
 
 //usage:#define timeout_trivial_usage
-//usage:       "[-t SECS] [-s SIG] PROG ARGS"
+//usage:       "[-s SIG] SECS PROG ARGS"
 //usage:#define timeout_full_usage "\n\n"
 //usage:       "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n"
-//usage:       "Defaults: SECS: 10, SIG: TERM."
+//usage:       "Default SIG: TERM."
 
 #include "libbb.h"
 
@@ -68,7 +68,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         DWORD status = EXIT_SUCCESS;
 #endif
         int parent = 0;
-        int timeout = 10;
+        int timeout;
         pid_t pid;
 #if !BB_MMU
         char *sv1, *sv2;
@@ -83,25 +83,34 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
 
         /* -t SECONDS; -p PARENT_PID */
         /* '+': stop at first non-option */
-        getopt32(argv, "+s:t:+" USE_FOR_NOMMU("p:+"), &opt_s, &timeout, &parent);
+        getopt32(argv, "+s:" USE_FOR_NOMMU("p:+"), &opt_s, &parent);
         /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
+
         signo = get_signum(opt_s);
 #if !ENABLE_PLATFORM_MINGW32
         if (signo < 0)
+#else
+        if (signo != SIGTERM && signo != SIGKILL && signo != 0)
+#endif
                 bb_error_msg_and_die("unknown signal '%s'", opt_s);
 
+        if (!argv[optind])
+                bb_show_usage();
+        timeout = parse_duration_str(argv[optind++]);
+        if (!argv[optind]) /* no PROG? */
+                bb_show_usage();
+
+#if !ENABLE_PLATFORM_MINGW32
         /* We want to create a grandchild which will watch
          * and kill the grandparent. Other methods:
          * making parent watch child disrupts parent<->child link
          * (example: "tcpsvd 0.0.0.0 1234 timeout service_prog" -
          * it's better if service_prog is a child of tcpsvd!),
          * making child watch parent results in programs having
-         * unexpected children. */
+         * unexpected children. */
 
         if (parent) /* we were re-execed, already grandchild */
                 goto grandchild;
-        if (!argv[optind]) /* no PROG? */
-                bb_show_usage();
 
 #if !BB_MMU
         sv1 = argv[optind];
@@ -146,13 +155,6 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
 #endif
         BB_EXECVP_or_die(argv);
 #else /* ENABLE_PLATFORM_MINGW32 */
-        if (signo != SIGTERM && signo != SIGKILL && signo != 0)
-                bb_error_msg_and_die("unknown signal '%s'", opt_s);
-
-        argv += optind;
-        if (argv[0] == NULL)
-                bb_show_usage();
-
         if ((ret=mingw_spawn_proc((const char **)argv)) == -1) {
                 xfunc_error_retval = errno == EACCES ? 126 : 127;
                 bb_perror_msg_and_die("can't execute '%s'", argv[0]);