c2bd0b680
Denys Vlasenko
2021-03-23
Subject
timeout,top,watch,ping: parse NN.N fractional duration in locales with other separators
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/printf.c +1 -0coreutils/sleep.c +0 -4coreutils/sort.c +1 -0libbb/duration.c +12 -2miscutils/dc.c +1 -0networking/brctl.c +1 -0
coreutils/printf.c+1 -0
| @@ -122,6 +122,7 @@ static void FAST_FUNC conv_strtod(const char *arg, void *result) | |
| char *end; | |
| /* Well, this one allows leading whitespace... so what? */ | |
| /* What I like much less is that "-" accepted too! :( */ | |
| + | //TODO: needs setlocale(LC_NUMERIC, "C")? |
| *(double*)result = strtod(arg, &end); | |
| if (end[0]) { | |
| errno = ERANGE; | |
coreutils/sleep.c+0 -4
| @@ -74,10 +74,6 @@ int sleep_main(int argc UNUSED_PARAM, char **argv) | |
| sleep(INT_MAX); | |
| #if ENABLE_FEATURE_FANCY_SLEEP | |
| - | # if ENABLE_FLOAT_DURATION |
| - | /* undo busybox.c setlocale */ |
| - | setlocale(LC_NUMERIC, "C"); |
| - | # endif |
| duration = 0; | |
| do { | |
| duration += parse_duration_str(*argv); | |
coreutils/sort.c+1 -0
| @@ -295,6 +295,7 @@ static int compare_keys(const void *xarg, const void *yarg) | |
| #if ENABLE_FEATURE_SORT_BIG | |
| case FLAG_g: { | |
| char *xx, *yy; | |
| + | //TODO: needs setlocale(LC_NUMERIC, "C")? |
| double dx = strtod(x, &xx); | |
| double dy = strtod(y, &yy); | |
| /* not numbers < NaN < -infinity < numbers < +infinity) */ | |
libbb/duration.c+12 -2
| @@ -37,8 +37,18 @@ duration_t FAST_FUNC parse_duration_str(char *str) | |
| if (strchr(str, '.')) { | |
| double d; | |
| char *pp; | |
| - | int len = strspn(str, "0123456789."); |
| - | char sv = str[len]; |
| + | int len; |
| + | char sv; |
| + | |
| + | # if ENABLE_LOCALE_SUPPORT |
| + | /* Undo busybox.c: on input, we want to use dot |
| + | * as fractional separator in strtod(), |
| + | * regardless of current locale |
| + | */ |
| + | setlocale(LC_NUMERIC, "C"); |
| + | # endif |
| + | len = strspn(str, "0123456789."); |
| + | sv = str[len]; |
| str[len] = '\0'; | |
| errno = 0; | |
| d = strtod(str, &pp); | |
miscutils/dc.c+1 -0
| @@ -229,6 +229,7 @@ static void stack_machine(const char *argument) | |
| const struct op *o; | |
| next: | |
| + | //TODO: needs setlocale(LC_NUMERIC, "C")? |
| number = strtod(argument, &end); | |
| if (end != argument) { | |
| argument = end; | |
networking/brctl.c+1 -0
| @@ -89,6 +89,7 @@ static unsigned str_to_jiffies(const char *time_str) | |
| { | |
| double dd; | |
| char *endptr; | |
| + | //TODO: needs setlocale(LC_NUMERIC, "C")? |
| dd = /*bb_*/strtod(time_str, &endptr); | |
| if (endptr == time_str || dd < 0) | |
| bb_error_msg_and_die(bb_msg_invalid_arg_to, time_str, "timespec"); | |