From c2bd0b680667c7ec4956552f75d9ff7d040ac941 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 23 Mar 2021 13:50:02 +0100 Subject: timeout,top,watch,ping: parse NN.N fractional duration in locales with other separators Signed-off-by: Denys Vlasenko --- libbb/duration.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'libbb') diff --git a/libbb/duration.c b/libbb/duration.c index 086da15..a6a29dd 100644 --- a/libbb/duration.c +++ b/libbb/duration.c @@ -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); -- cgit v1.1