diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-15 09:50:54 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-15 09:50:54 +0200 |
| commit | 4813a5100d70385118ee23b0171e14bc61c81f30 (patch) | |
| tree | ac753e330f1cab7ab0be5ea87dafbde4d9103e8e | |
| parent | cd3dd42c28832da92ee0d4d3afe7cf722e38f80c (diff) | |
libbb: stop using bb_strtod for now
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/sleep.c | 6 | ||||
| -rw-r--r-- | libbb/Kbuild | 2 | ||||
| -rw-r--r-- | libbb/bb_strtod.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/coreutils/sleep.c b/coreutils/sleep.c index de18dd0db..b16d03c2b 100644 --- a/coreutils/sleep.c +++ b/coreutils/sleep.c @@ -54,11 +54,13 @@ int sleep_main(int argc UNUSED_PARAM, char **argv) char *arg = *argv; if (strchr(arg, '.')) { double d; + char *pp; int len = strspn(arg, "0123456789."); char sv = arg[len]; arg[len] = '\0'; - d = bb_strtod(arg, NULL); - if (errno) + errno = 0; + d = strtod(arg, &pp); + if (errno || *pp) bb_show_usage(); arg[len] = sv; len--; diff --git a/libbb/Kbuild b/libbb/Kbuild index 8fddabdba..70dc48dcb 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -13,7 +13,7 @@ lib-y += bb_basename.o lib-y += bb_do_delay.o lib-y += bb_pwd.o lib-y += bb_qsort.o -lib-y += bb_strtod.o +#lib-y += bb_strtod.o lib-y += bb_strtonum.o lib-y += change_identity.o lib-y += chomp.o diff --git a/libbb/bb_strtod.c b/libbb/bb_strtod.c index 39bdeb5e5..1e9671029 100644 --- a/libbb/bb_strtod.c +++ b/libbb/bb_strtod.c @@ -12,6 +12,7 @@ #define NOT_DIGIT(a) (((unsigned char)(a-'0')) > 9) +#if 0 // UNUSED double FAST_FUNC bb_strtod(const char *arg, char **endp) { double v; @@ -36,6 +37,7 @@ double FAST_FUNC bb_strtod(const char *arg, char **endp) } return v; } +#endif #if 0 /* String to timespec: "NNNN[.NNNNN]" -> struct timespec. |