ls: add support for -H

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

diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 3946c3433cbe42117e2d1a3317bd01a55f4bfe23..433f9d6eec58f86880ae9597cb492f88ca1bdf75 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,56 +18,94 @@
  * time suffixes for seconds, minutes, hours, and days.
  */
 
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
-static const struct suffix_mult sleep_suffixes[] = {
+/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
+
+
+#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 },
-       { NULL, 0 }
+       { "", 0 }
 };
 #endif
 
-int sleep_main(int argc, char **argv)
+int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int sleep_main(int argc UNUSED_PARAM, char **argv)
 {
-       unsigned int duration;
-
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
+#if ENABLE_FEATURE_FLOAT_SLEEP
+       double duration;
+       struct timespec ts;
+#else
+       unsigned duration;
+#endif
 
-       if (argc < 2) {
+       ++argv;
+       if (!*argv)
                bb_show_usage();
-       }
 
-       ++argv;
+#if ENABLE_FEATURE_FLOAT_SLEEP
+
+# if ENABLE_LOCALE_SUPPORT
+       /* undo busybox.c setlocale */
+       setlocale(LC_NUMERIC, "C");
+# endif
        duration = 0;
        do {
-               duration += bb_xgetularg_bnd_sfx(*argv, 10,
-                                                                                0, UINT_MAX-duration,
-                                                                                sleep_suffixes);
+               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  /* CONFIG_FEATURE_FANCY_SLEEP */
-
-       if (argc != 2) {
-               bb_show_usage();
+       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);
 
-#if UINT_MAX == ULONG_MAX
-       duration = bb_xgetularg10(argv[1]);
-#else
-       duration = bb_xgetularg10_bnd(argv[1], 0, UINT_MAX);
-#endif
+#elif ENABLE_FEATURE_FANCY_SLEEP
+
+       duration = 0;
+       do {
+               duration += xatou_range_sfx(*argv, 0, UINT_MAX - duration, sfx);
+       } while (*++argv);
+       sleep(duration);
 
-#endif /* CONFIG_FEATURE_FANCY_SLEEP */
+#else /* simple */
 
-       if (sleep(duration)) {
-               bb_perror_nomsg_and_die();
-       }
+       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;
 }