Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/sleep.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/sleep.c (modified) (4 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -32 +19 @@
  */
 
-#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[] = {
+/* This is a NOFORK applet. Be very careful! */
+
+
+#if ENABLE_FEATURE_FANCY_SLEEP
+static const struct suffix_mult sfx[] = {
     { "s", 1 },
     { "m", 60 },
     { "h", 60*60 },
     { "d", 24*60*60 },
-    { NULL, 0 }
+    { }
 };
 #endif
 
+int sleep_main(int argc, char **argv);
 int sleep_main(int argc, char **argv)
 {
-    unsigned int duration;
+    unsigned duration;
 
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
+#if ENABLE_FEATURE_FANCY_SLEEP
 
     if (argc < 2) {
@@ -60 +48 @@
     duration = 0;
     do {
-        duration += bb_xgetularg_bnd_sfx(*argv, 10,
-                                         0, UINT_MAX-duration,
-                                         sleep_suffixes);
+        duration += xatoul_range_sfx(*argv, 0, UINT_MAX-duration, sfx);
     } while (*++argv);
 
-#else  /* CONFIG_FEATURE_FANCY_SLEEP */
+#else  /* FEATURE_FANCY_SLEEP */
 
     if (argc != 2) {
@@ -71 +57 @@
     }
 
-#if UINT_MAX == ULONG_MAX
-    duration = bb_xgetularg10(argv[1]);
-#else
-    duration = bb_xgetularg10_bnd(argv[1], 0, UINT_MAX);
-#endif
+    duration = xatou(argv[1]);
 
-#endif /* CONFIG_FEATURE_FANCY_SLEEP */
+#endif /* FEATURE_FANCY_SLEEP */
 
     if (sleep(duration)) {