From 93ef5dd640ef41edc72c80fa59c7cc9427b5945b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 30 Oct 2018 23:24:18 +0100 Subject: printf: fix printf "%u\n" +18446744073709551614 function old new delta conv_strtoll 19 32 +13 conv_strtoull 49 61 +12 bb_strtoll 89 84 -5 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/1 up/down: 25/-5) Total: 20 bytes Signed-off-by: Denys Vlasenko --- coreutils/printf.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'coreutils') diff --git a/coreutils/printf.c b/coreutils/printf.c index b2429c5cf..67d3b2eda 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c @@ -95,6 +95,12 @@ static int multiconvert(const char *arg, void *result, converter convert) static void FAST_FUNC conv_strtoull(const char *arg, void *result) { + /* Allow leading '+' - bb_strtoull() by itself does not allow it, + * and probably shouldn't (other callers might require purely numeric + * inputs to be allowed. + */ + if (arg[0] == '+') + arg++; *(unsigned long long*)result = bb_strtoull(arg, NULL, 0); /* both coreutils 6.10 and bash 3.2: * $ printf '%x\n' -2 @@ -107,6 +113,8 @@ static void FAST_FUNC conv_strtoull(const char *arg, void *result) } static void FAST_FUNC conv_strtoll(const char *arg, void *result) { + if (arg[0] == '+') + arg++; *(long long*)result = bb_strtoll(arg, NULL, 0); } static void FAST_FUNC conv_strtod(const char *arg, void *result) -- cgit v1.2.3