From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6968 invoked by alias); 29 Nov 2017 14:01:47 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 6922 invoked by uid 9078); 29 Nov 2017 14:01:47 -0000 Date: Wed, 29 Nov 2017 14:01:00 -0000 Message-ID: <20171129140147.6919.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: [w]scanf: Fix behaviour on matching failure X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 39138114542027e2df79333c91f494cc3e058d6e X-Git-Newrev: 1bbdb3c9533684282695e147d0480b771fd13687 X-SW-Source: 2017-q4/txt/msg00026.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1bbdb3c9533684282695e147d0480b771fd13687 commit 1bbdb3c9533684282695e147d0480b771fd13687 Author: Corinna Vinschen Date: Wed Nov 29 15:01:30 2017 +0100 newlib: [w]scanf: Fix behaviour on matching failure The special handling of %\0 in [w]scanf is flawed. It's just a matching failure and should be handled as such. scanf also fakes an int input value on %X with X being an invalid conversion char. This is also just a matching failure and should be handled the same way as %\0. There's no indication of the reason for this "disgusting backwards compatibility hacks" in the logs, given this code made it into newlib before setting up the CVS repo. Just handle these cases identically as matching failures. Signed-off-by: Corinna Vinschen Diff: --- newlib/libc/stdio/vfscanf.c | 16 ++-------------- newlib/libc/stdio/vfwscanf.c | 9 +-------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index 544d8db..c5fcae5 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -787,20 +787,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), } continue; - /* - * Disgusting backwards compatibility hacks. XXX - */ - case '\0': /* compat */ - _newlib_flockfile_exit (fp); - return EOF; - - default: /* compat */ - if (isupper (c)) - flags |= LONG; - c = CT_INT; - ccfn = (u_long (*)CCFN_PARAMS)_strtol_r; - base = 10; - break; + default: + goto match_failure; } /* diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c index 5b35601..fd4f1f9 100644 --- a/newlib/libc/stdio/vfwscanf.c +++ b/newlib/libc/stdio/vfwscanf.c @@ -740,14 +740,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap), } continue; - /* - * Disgusting backwards compatibility hacks. XXX - */ - case L'\0': /* compat */ - _newlib_flockfile_exit (fp); - return EOF; - - default: /* compat */ + default: goto match_failure; }