diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-12 17:05:14 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-12 17:05:14 +0000 |
commit | adbb73bda7c0ff75caceaf6ad29187293f0afd3f (patch) | |
tree | acfa5f28ecd65dc585e83200816a904febf01e25 /coreutils | |
parent | 34e8f6a7ac6a88304e89725d7286f1ff4405a70c (diff) | |
download | busybox-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
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/sleep.c | 57 |
1 files changed, 49 insertions, 8 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[] = { | |||
36 | int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 36 | int sleep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
37 | int sleep_main(int argc UNUSED_PARAM, char **argv) | 37 | int 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 | } |