From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3558 invoked by alias); 19 Apr 2004 22:19:58 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 3542 invoked from network); 19 Apr 2004 22:19:58 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26) by sources.redhat.com with SMTP; 19 Apr 2004 22:19:58 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i3JK8MHS031252; Mon, 19 Apr 2004 22:08:22 +0200 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i3JK8Ma3031234; Mon, 19 Apr 2004 22:08:22 +0200 Date: Mon, 19 Apr 2004 22:19:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix *scanf Message-ID: <20040419200821.GT514@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2004-04/txt/msg00062.txt.bz2 Hi! I'm not 100% sure this is correct, but certainly this patch makes tst-sscanf behave like on Solaris. The second hunk makes sure "x%%y" doesn't match "x %y" and the first causes input_error if EOF is seen while skipping whitespace. 2004-04-20 Jakub Jelinek * stdio-common/vfscanf.c (_IO_vfscanf): When skipping whitespace, do input_error () instead of conv_error () and don't look at errno. Don't eat any whitespace before %% if skip_space == 0. * stdio-common/tst-sscanf.c (int_tests): New array. (main): Run int_tests. --- libc/stdio-common/vfscanf.c.jj 2004-04-19 23:31:19.613093185 +0200 +++ libc/stdio-common/vfscanf.c 2004-04-19 23:56:25.808163418 +0200 @@ -396,8 +396,8 @@ _IO_vfscanf (s, format, argptr, errp) if (skip_space) { while (ISSPACE (c)) - if (inchar () == EOF && errno == EINTR) - conv_error (); + if (inchar () == EOF) + input_error (); skip_space = 0; } @@ -543,7 +543,8 @@ _IO_vfscanf (s, format, argptr, errp) /* Find the conversion specifier. */ fc = *f++; if (skip_space || (fc != L_('[') && fc != L_('c') - && fc != L_('C') && fc != L_('n'))) + && fc != L_('C') && fc != L_('n') + && fc != L_('%'))) { /* Eat whitespace. */ int save_errno = errno; --- libc/stdio-common/tst-sscanf.c.jj 2002-10-11 12:55:27.000000000 +0200 +++ libc/stdio-common/tst-sscanf.c 2004-04-19 23:58:39.702167869 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek , 2000. @@ -59,6 +59,39 @@ const long int val_long[] = -12345678, 987654321, 123456789, 987654321, 123456789, 987654321 }; +struct int_test +{ + const char *str; + const char *fmt; + int retval; +} int_tests[] = +{ + { "foo\n", "foo\nbar", -1 }, + { "foo\n", "foo bar", -1 }, + { "foo\n", "foo %d", -1 }, + { "foo\n", "foo\n%d", -1 }, + { "foon", "foonbar", -1 }, + { "foon", "foon%d", -1 }, + { "foo ", "foo bar", -1 }, + { "foo ", "foo %d", -1 }, + { "foo\t", "foo\tbar", -1 }, + { "foo\t", "foo bar", -1 }, + { "foo\t", "foo %d", -1 }, + { "foo\t", "foo\t%d", -1 }, + { "foo \t %bar1", "foo%%bar%d", 0 }, + { "foo", "foo", 0 }, + { "foon", "foo bar", 0 }, + { "foon", "foo %d", 0 }, + { "foo ", "fooxbar", 0 }, + { "foo ", "foox%d", 0 }, + { "foo bar", "foon", 0 }, + { "foo bar", "foo bar", 0 }, + { "foo bar", "foo %d", 0 }, + { "foo bar", "foon%d", 0 }, + { "foo ", "foo %n", 0 }, + { "foo%bar1", "foo%%bar%d", 1 } +}; + int main (void) { @@ -119,5 +152,18 @@ main (void) break; } + for (i = 0; i < sizeof (int_tests) / sizeof (int_tests[0]); ++i) + { + int dummy, ret; + + if ((ret = sscanf (int_tests[i].str, int_tests[i].fmt, + &dummy)) != int_tests[i].retval) + { + printf ("int_tests[%d] returned %d != %d\n", + i, ret, int_tests[i].retval); + result = 1; + } + } + return result; } Jakub