public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: [w]scanf: Fix behaviour on matching failure Date: Wed, 29 Nov 2017 14:01:00 -0000 [thread overview] Message-ID: <20171129140147.6919.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1bbdb3c9533684282695e147d0480b771fd13687 commit 1bbdb3c9533684282695e147d0480b771fd13687 Author: Corinna Vinschen <corinna@vinschen.de> 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 <corinna@vinschen.de> 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; }
reply other threads:[~2017-11-29 14:01 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171129140147.6919.qmail@sourceware.org \ --to=corinna@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).