bc: convert to "G trick" - this returns bc to zero bss increase

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

diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index b89b0fe9ca488ac59671712cfa91823b599b9d27..126665839a2a6dea284e0357c76c29d98dfe15d1 100644 (file)
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -4,65 +4,83 @@
  *
  * 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 */
-/* BB_AUDIT GNU issues -- fancy version matches except args must be ints. */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/sleep.html */
-
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
  * Rewritten to do proper arg and error checking.
  * Also, added a 'fancy' configuration to accept multiple args with
  * time suffixes for seconds, minutes, hours, and days.
  */
+//config:config SLEEP
+//config:      bool "sleep (1.7 kb)"
+//config:      default y
+//config:      help
+//config:      sleep is used to pause for a specified number of seconds.
+//config:      It comes in 3 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:
+//config:config FEATURE_FANCY_SLEEP
+//config:      bool "Enable multiple arguments and s/m/h/d suffixes"
+//config:      default y
+//config:      depends on SLEEP
+//config:      help
+//config:      Allow sleep to pause for specified minutes, hours, and days.
 
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include "busybox.h"
+/* 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))
 
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
-static const struct suffix_mult sfx[] = {
-       { "s", 1 },
-       { "m", 60 },
-       { "h", 60*60 },
-       { "d", 24*60*60 },
-       { NULL, 0 }
-};
-#endif
+//kbuild:lib-$(CONFIG_SLEEP) += sleep.o
 
-int sleep_main(int argc, char **argv);
-int sleep_main(int argc, char **argv)
-{
-       unsigned int duration;
+/* BB_AUDIT SUSv3 compliant */
+/* BB_AUDIT GNU issues -- fancy version matches except args must be ints. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/sleep.html */
 
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
+//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")
 
-       if (argc < 2) {
-               bb_show_usage();
-       }
+#include "libbb.h"
+
+int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int sleep_main(int argc UNUSED_PARAM, char **argv)
+{
+       duration_t duration;
 
        ++argv;
+       if (!*argv)
+               bb_show_usage();
+
+#if ENABLE_FEATURE_FANCY_SLEEP
+# if ENABLE_FLOAT_DURATION
+       /* undo busybox.c setlocale */
+       setlocale(LC_NUMERIC, "C");
+# endif
        duration = 0;
        do {
-               duration += xatoul_range_sfx(*argv, 0, UINT_MAX-duration, sfx);
+               duration += parse_duration_str(*argv);
        } while (*++argv);
-
-#else  /* CONFIG_FEATURE_FANCY_SLEEP */
-
-       if (argc != 2) {
-               bb_show_usage();
-       }
-
-       duration = xatou(argv[1]);
-
-#endif /* CONFIG_FEATURE_FANCY_SLEEP */
-
-       if (sleep(duration)) {
-               bb_perror_nomsg_and_die();
-       }
-
+       sleep_for_duration(duration);
+#else /* simple */
+       duration = xatou(*argv);
+       sleep(duration);
+#endif
        return EXIT_SUCCESS;
 }