summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-12 17:05:14 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-12 17:05:14 +0000
commitadbb73bda7c0ff75caceaf6ad29187293f0afd3f (patch)
treeacfa5f28ecd65dc585e83200816a904febf01e25
parent34e8f6a7ac6a88304e89725d7286f1ff4405a70c (diff)
downloadbusybox-w32-adbb73bda7c0ff75caceaf6ad29187293f0afd3f.tar.gz
busybox-w32-adbb73bda7c0ff75caceaf6ad29187293f0afd3f.tar.bz2
busybox-w32-adbb73bda7c0ff75caceaf6ad29187293f0afd3f.zip
sleep: if FANCY && DESKTOP, support fractional seconds, minutes,
hours and so on. It's coreutils compat. bloatcheck is atrocious :( function old new delta sleep_main 71 362 +291 bb_strtod - 127 +127 make_device 1269 1294 +25 getoptscmd 708 713 +5 switch_root_main 402 401 -1 display_speed 90 85 -5 show_entry 295 289 -6 parse_expr 841 833 -8 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 3/4 up/down: 448/-20) Total: 428 bytes
-rw-r--r--coreutils/sleep.c57
-rw-r--r--include/xatonum.h2
-rw-r--r--libbb/Kbuild1
-rw-r--r--libbb/bb_strtod.c85
-rw-r--r--libbb/bb_strtonum.c30
5 files changed, 136 insertions, 39 deletions
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 162d82006..93b178d76 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -36,28 +36,69 @@ static const struct suffix_mult sfx[] = {
36int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 36int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
37int sleep_main(int argc UNUSED_PARAM, char **argv) 37int sleep_main(int argc UNUSED_PARAM, char **argv)
38{ 38{
39#if ENABLE_FEATURE_FANCY_SLEEP && ENABLE_DESKTOP
40 double duration;
41 struct timespec ts;
42#else
39 unsigned duration; 43 unsigned duration;
44#endif
40 45
41 ++argv; 46 ++argv;
42 if (!*argv) 47 if (!*argv)
43 bb_show_usage(); 48 bb_show_usage();
44 49
45#if ENABLE_FEATURE_FANCY_SLEEP 50#if ENABLE_FEATURE_FANCY_SLEEP && ENABLE_DESKTOP
46 51
47 duration = 0; 52 duration = 0;
48 do { 53 do {
49 duration += xatoul_range_sfx(*argv, 0, UINT_MAX-duration, sfx); 54 char *arg = *argv;
55 if (strchr(arg, '.')) {
56 double d;
57 int len = strspn(arg, "0123456789.");
58 char sv = arg[len];
59 arg[len] = '\0';
60 d = bb_strtod(arg, NULL);
61 if (errno)
62 bb_show_usage();
63 arg[len] = sv;
64 len--;
65 sv = arg[len];
66 arg[len] = '1';
67 duration += d * xatoul_sfx(&arg[len], sfx);
68 arg[len] = sv;
69 } else
70 duration += xatoul_sfx(arg, sfx);
50 } while (*++argv); 71 } while (*++argv);
51 72
52#else /* FEATURE_FANCY_SLEEP */ 73 ts.tv_sec = MAXINT(typeof(ts.tv_sec));
74 ts.tv_nsec = 0;
75 if (duration >= 0 && duration < ts.tv_sec) {
76 ts.tv_sec = duration;
77 ts.tv_nsec = (duration - ts.tv_sec) * 1000000000;
78 }
79 do {
80 errno = 0;
81 nanosleep(&ts, &ts);
82 } while (errno == EINTR);
53 83
54 duration = xatou(*argv); 84#elif ENABLE_FEATURE_FANCY_SLEEP
55 85
56#endif /* FEATURE_FANCY_SLEEP */ 86 duration = 0;
87 do {
88 duration += xatou_range_sfx(*argv, 0, UINT_MAX - duration, sfx);
89 } while (*++argv);
90 sleep(duration);
57 91
58 if (sleep(duration)) { 92#else /* simple */
59 bb_perror_nomsg_and_die(); 93
60 } 94 duration = xatou(*argv);
95 sleep(duration);
96 // Off. If it's really needed, provide example why
97 //if (sleep(duration)) {
98 // bb_perror_nomsg_and_die();
99 //}
100
101#endif
61 102
62 return EXIT_SUCCESS; 103 return EXIT_SUCCESS;
63} 104}
diff --git a/include/xatonum.h b/include/xatonum.h
index 944ee7742..02aacc0d5 100644
--- a/include/xatonum.h
+++ b/include/xatonum.h
@@ -169,7 +169,7 @@ uint32_t bb_strtou32(const char *arg, char **endp, int base)
169 169
170/* Floating point */ 170/* Floating point */
171 171
172/* double bb_strtod(const char *arg, char **endp); */ 172double bb_strtod(const char *arg, char **endp) FAST_FUNC;
173 173
174#if __GNUC_PREREQ(4,1) 174#if __GNUC_PREREQ(4,1)
175# pragma GCC visibility pop 175# pragma GCC visibility pop
diff --git a/libbb/Kbuild b/libbb/Kbuild
index c49297b12..ab85ffc9e 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -13,6 +13,7 @@ lib-y += bb_basename.o
13lib-y += bb_do_delay.o 13lib-y += bb_do_delay.o
14lib-y += bb_pwd.o 14lib-y += bb_pwd.o
15lib-y += bb_qsort.o 15lib-y += bb_qsort.o
16lib-y += bb_strtod.o
16lib-y += bb_strtonum.o 17lib-y += bb_strtonum.o
17lib-y += change_identity.o 18lib-y += change_identity.o
18lib-y += chomp.o 19lib-y += chomp.o
diff --git a/libbb/bb_strtod.c b/libbb/bb_strtod.c
new file mode 100644
index 000000000..0515ff867
--- /dev/null
+++ b/libbb/bb_strtod.c
@@ -0,0 +1,85 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * Utility routines.
4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 *
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 */
9
10#include "libbb.h"
11#include <math.h> /* just for HUGE_VAL */
12
13#define NOT_DIGIT(a) (((unsigned char)(a-'0')) > 9)
14
15double FAST_FUNC bb_strtod(const char *arg, char **endp)
16{
17 double v;
18 char *endptr;
19
20 if (arg[0] != '-' && NOT_DIGIT(arg[0]))
21 goto err;
22 errno = 0;
23 v = strtod(arg, &endptr);
24 if (endp)
25 *endp = endptr;
26 if (endptr[0]) {
27 /* "1234abcg" or out-of-range? */
28 if (isalnum(endptr[0]) || errno) {
29 err:
30 errno = ERANGE;
31 return HUGE_VAL;
32 }
33 /* good number, just suspicious terminator */
34 errno = EINVAL;
35 }
36 return v;
37}
38
39#if 0
40/* String to timespec: "NNNN[.NNNNN]" -> struct timespec.
41 * Can be used for other fixed-point needs.
42 * Returns pointer past last converted char,
43 * and returns errno similar to bb_strtoXX functions.
44 */
45char* FAST_FUNC bb_str_to_ts(struct timespec *ts, const char *arg)
46{
47 if (sizeof(ts->tv_sec) <= sizeof(int))
48 ts->tv_sec = bb_strtou(arg, &arg, 10);
49 else if (sizeof(ts->tv_sec) <= sizeof(long))
50 ts->tv_sec = bb_strtoul(arg, &arg, 10);
51 else
52 ts->tv_sec = bb_strtoull(arg, &arg, 10);
53 ts->tv_nsec = 0;
54
55 if (*arg != '.')
56 return arg;
57
58 /* !EINVAL: number is not ok (alphanumeric ending, overflow etc) */
59 if (errno != EINVAL)
60 return arg;
61
62 if (!*++arg) /* "NNN." */
63 return arg;
64
65 { /* "NNN.xxx" - parse xxx */
66 int ndigits;
67 char *p;
68 char buf[10]; /* we never use more than 9 digits */
69
70 /* Need to make a copy to avoid false overflow */
71 safe_strncpy(buf, arg, 10);
72 ts->tv_nsec = bb_strtou(buf, &p, 10);
73 ndigits = p - buf;
74 arg += ndigits;
75 /* normalize to nsec */
76 while (ndigits < 9) {
77 ndigits++;
78 ts->tv_nsec *= 10;
79 }
80 while (isdigit(*arg)) /* skip possible 10th plus digits */
81 arg++;
82 }
83 return arg;
84}
85#endif
diff --git a/libbb/bb_strtonum.c b/libbb/bb_strtonum.c
index 525c830cd..50ed99b4b 100644
--- a/libbb/bb_strtonum.c
+++ b/libbb/bb_strtonum.c
@@ -124,33 +124,3 @@ int FAST_FUNC bb_strtoi(const char *arg, char **endp, int base)
124 return handle_errors(v, endp, endptr); 124 return handle_errors(v, endp, endptr);
125} 125}
126#endif 126#endif
127
128/* Floating point */
129
130#if 0
131
132#include <math.h> /* just for HUGE_VAL */
133#define NOT_DIGIT(a) (((unsigned char)(a-'0')) > 9)
134double FAST_FUNC bb_strtod(const char *arg, char **endp)
135{
136 double v;
137 char *endptr;
138
139 if (arg[0] != '-' && NOT_DIGIT(arg[0])) goto err;
140 errno = 0;
141 v = strtod(arg, &endptr);
142 if (endp) *endp = endptr;
143 if (endptr[0]) {
144 /* "1234abcg" or out-of-range? */
145 if (isalnum(endptr[0]) || errno) {
146 err:
147 errno = ERANGE;
148 return HUGE_VAL;
149 }
150 /* good number, just suspicious terminator */
151 errno = EINVAL;
152 }
153 return v;
154}
155
156#endif