From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752679AbbEBAuQ (ORCPT ); Fri, 1 May 2015 20:50:16 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:33777 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804AbbEBAuM (ORCPT ); Fri, 1 May 2015 20:50:12 -0400 Date: Sat, 2 May 2015 03:50:08 +0300 From: Alexey Dobriyan To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 03/10] parse_integer: convert sscanf() Message-ID: <20150502005008.GC21655@p183.telecom.by> References: <20150502004714.GA21655@p183.telecom.by> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150502004714.GA21655@p183.telecom.by> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove base second guessing. Uniformly fix too liberal acceptance in %lu/%ld cases in the next patch. Signed-off-by: Alexey Dobriyan --- lib/vsprintf.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2470,8 +2470,6 @@ EXPORT_SYMBOL_GPL(bprintf); int vsscanf(const char *buf, const char *fmt, va_list args) { const char *str = buf; - char *next; - char digit; int num = 0; u8 qualifier; unsigned int base; @@ -2483,6 +2481,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args) bool is_sign; while (*fmt) { + int len; + /* skip any white space in format */ /* white space in format matchs any amount of * white space, including none, in the input. @@ -2611,35 +2611,22 @@ int vsscanf(const char *buf, const char *fmt, va_list args) */ str = skip_spaces(str); - digit = *str; - if (is_sign && digit == '-') - digit = *(str + 1); - - if (!digit - || (base == 16 && !isxdigit(digit)) - || (base == 10 && !isdigit(digit)) - || (base == 8 && (!isdigit(digit) || digit > '7')) - || (base == 0 && !isdigit(digit))) - break; - if (is_sign) - val.s = qualifier != 'L' ? - simple_strtol(str, &next, base) : - simple_strtoll(str, &next, base); + len = parse_integer(str, base, &val.s); else - val.u = qualifier != 'L' ? - simple_strtoul(str, &next, base) : - simple_strtoull(str, &next, base); + len = parse_integer(str, base, &val.u); + if (len < 0) + break; - if (field_width > 0 && next - str > field_width) { + if (field_width > 0) { if (base == 0) _parse_integer_fixup_radix(str, &base); - while (next - str > field_width) { + while (len > field_width) { if (is_sign) val.s = div_s64(val.s, base); else val.u = div_u64(val.u, base); - --next; + len--; } } @@ -2680,10 +2667,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args) break; } num++; - - if (!next) - break; - str = next; + str += len; } return num;