Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / sleep.c

diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 78f9a8e..0ffbd16 100644 (file)
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -18,46 +18,109 @@
  * time suffixes for seconds, minutes, hours, and days.
  */
 
+//usage:#define sleep_trivial_usage
+//usage:       IF_FEATURE_FANCY_SLEEP("[") "N" IF_FEATURE_FANCY_SLEEP("]...")
+//usage:#define sleep_full_usage "\n\n"
+//usage:       IF_NOT_FEATURE_FANCY_SLEEP("Pause for N seconds")
+//usage:       IF_FEATURE_FANCY_SLEEP(
+//usage:       "Pause for a time equal to the total of the args given, where each arg can\n"
+//usage:       "have an optional suffix of (s)econds, (m)inutes, (h)ours, or (d)ays")
+//usage:
+//usage:#define sleep_example_usage
+//usage:       "$ sleep 2\n"
+//usage:       "[2 second delay results]\n"
+//usage:       IF_FEATURE_FANCY_SLEEP(
+//usage:       "$ sleep 1d 3h 22m 8s\n"
+//usage:       "[98528 second delay results]\n")
+
 #include "libbb.h"
 
-/* This is a NOFORK applet. Be very careful! */
+/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
 
 
-#if ENABLE_FEATURE_FANCY_SLEEP
+#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 ATTRIBUTE_UNUSED, char **argv)
+int sleep_main(int argc UNUSED_PARAM, char **argv)
 {
+#if ENABLE_FEATURE_FLOAT_SLEEP
+       double duration;
+       struct timespec ts;
+#else
        unsigned duration;
+#endif
 
        ++argv;
        if (!*argv)
                bb_show_usage();
 
-#if ENABLE_FEATURE_FANCY_SLEEP
+#if ENABLE_FEATURE_FLOAT_SLEEP
 
+# if ENABLE_LOCALE_SUPPORT
+       /* undo busybox.c setlocale */
+       setlocale(LC_NUMERIC, "C");
+# endif
        duration = 0;
        do {
-               duration += xatoul_range_sfx(*argv, 0, UINT_MAX-duration, sfx);
+               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);
+               }
        } while (*++argv);
 
-#else  /* FEATURE_FANCY_SLEEP */
+       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);
 
-       duration = xatou(*argv);
+#elif ENABLE_FEATURE_FANCY_SLEEP
 
-#endif /* FEATURE_FANCY_SLEEP */
+       duration = 0;
+       do {
+               duration += xatou_range_sfx(*argv, 0, UINT_MAX - duration, sfx);
+       } while (*++argv);
+       sleep(duration);
 
-       if (sleep(duration)) {
-               bb_perror_nomsg_and_die();
-       }
+#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;
 }