Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/sleep.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/sleep.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/coreutils/sleep.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -21 +21 @@
 #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 },
@@ -30 +30 @@
     { "h", 60*60 },
     { "d", 24*60*60 },
-    { }
+    { "", 0 }
 };
 #endif
 
-int sleep_main(int argc, char **argv);
-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)
 {
+#if ENABLE_FEATURE_FLOAT_SLEEP
+    double duration;
+    struct timespec ts;
+#else
     unsigned duration;
-
-#if ENABLE_FEATURE_FANCY_SLEEP
-
-    if (argc < 2) {
-        bb_show_usage();
-    }
+#endif
 
     ++argv;
+    if (!*argv)
+        bb_show_usage();
+
+#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);
 
-    if (argc != 2) {
-        bb_show_usage();
-    }
+#elif ENABLE_FEATURE_FANCY_SLEEP
 
-    duration = xatou(argv[1]);
+    duration = 0;
+    do {
+        duration += xatou_range_sfx(*argv, 0, UINT_MAX - duration, sfx);
+    } while (*++argv);
+    sleep(duration);
 
-#endif /* 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;