summaryrefslogtreecommitdiff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index ac6fcdf79f..551849b115 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -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;