+Wed Jul 17 20:41:30 1996 Ulrich Drepper <drepper@cygnus.com>
+
+ * stdio-common/vfscanf.c: Major change. Now read character
+ from stream only if needed. Before it was read after the
+ previous character was used.
+ Bug reported by Martin Goik <goma0002@FH-Karlsruhe.DE>
+
+ * stdio-common/tstscanf.c: Change test program so that return
+ value is != 0 if one test failed.
+
Wed Jul 17 17:08:48 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+ * sysdeps/m68k/Makefile (crypt): Variable removed.
+ * sysdeps/sparc/Makefile: Likewise.
+
* version.h (VERSION): Update to 1.93.
* Makerules ($(libdir)/libc.so): Depend on
sscanf ("conversion] Zero flag Ze]ro#\n", "%*[^]] %[^#]\n", buf);
if (strcmp (buf, "] Zero flag Ze]ro") != 0)
{
- fputs ("test failed!", stderr);
+ fputs ("test failed!\n", stderr);
return 1;
}
"sscanf (\"thompson\", \"%%s\", name) == %d, name == \"%s\"\n",
sscanf ("thompson", "%s", name),
name);
+ if (strcmp (name, "thompson") != 0)
+ return 1;
}
fputs ("Testing scanf (vfscanf)\n", out);
n = fscanf (in, "%d%f%s", &i, &x, name);
fprintf (out, "n = %d, i = %d, x = %f, name = \"%.50s\"\n",
n, i, x, name);
+ if (n != 3 || i != 25 || x != 5.432F || strcmp (name, "thompson"))
+ return 1;
}
fprintf (out, "Residual: \"%s\"\n", fgets (buf, sizeof (buf), in));
+ if (strcmp (buf, "\n"))
+ return 1;
fputs ("Test 2:\n", out);
{
int i;
char name[50];
(void) fscanf (in, "%2d%f%*d %[0123456789]", &i, &x, name);
fprintf (out, "i = %d, x = %f, name = \"%.50s\"\n", i, x, name);
+ if (i != 56 || x != 789.0F || strcmp(name, "56"))
+ return 1;
}
fprintf (out, "Residual: \"%s\"\n", fgets (buf, sizeof (buf), in));
+ if (strcmp (buf, "a72\n"))
+ return 1;
fputs ("Test 3:\n", out);
{
+ static struct {
+ int count;
+ float quant;
+ const char *units;
+ const char *item;
+ } ok[] = {
+ { 3, 2.0F, "quarts", "oil" },
+ { 2, -12.8F, "degrees", "" },
+ { 0, 0.0F, "", "" },
+ { 3, 10.0F, "LBS", "fertilizer" },
+ { 3, 100.0F, "rgs", "energy" },
+ { -1, 0.0F, "", "" }};
+ int rounds = 0;
float quant;
char units[21], item[21];
while (!feof (in) && !ferror (in))
{
int count;
+
+ if (rounds++ >= sizeof (ok) / sizeof (ok[0]))
+ return 1;
+
quant = 0.0;
units[0] = item[0] = '\0';
count = fscanf (in, "%f%20s of %20s", &quant, units, item);
(void) fscanf (in, "%*[^\n]");
fprintf (out, "count = %d, quant = %f, item = %.21s, units = %.21s\n",
count, quant, item, units);
+ if (count != ok[rounds-1].count || quant != ok[rounds-1].quant
+ || strcmp (item, ok[rounds-1].item)
+ || strcmp (units, ok[rounds-1].units))
+ return 1;
}
}
+ buf[0] = '\0';
fprintf (out, "Residual: \"%s\"\n", fgets (buf, sizeof (buf), in));
+ if (strcmp (buf, ""))
+ return 1;
if (out != stdout)
pclose (out);
# include <libio.h>
# define va_list _IO_va_list
-# define ungetc(c, s) _IO_ungetc (c, s)
+# define ungetc(c, s) (--read_in, _IO_ungetc (c, s))
# define inchar() ((c = _IO_getc_unlocked (s)), (void) ++read_in, c)
# define conv_error() do { \
if (errp != NULL) *errp |= 2; \
- if (c != EOF) _IO_ungetc (c, s); \
_IO_funlockfile (s); \
return done; \
} while (0)
} \
} while (0)
#else
+# define ungetc(c, s) (--read_in, ungetc (c, s))
# define inchar() ((c = getc (s)), (void) ++read_in, c)
# define conv_error() do { \
funlockfile (s); \
- ungetc (c, s); \
return done; \
} while (0)
# define input_error() do { \
/* Lock the stream. */
flockfile (s);
- c = inchar ();
-
/* Run through the format string. */
while (*f != '\0')
{
int len = mblen (f, strlen (f));
if (len > 0)
{
- while (len-- > 0)
- if (c == EOF)
- input_error ();
- else if (c == *f++)
- (void) inchar ();
- else
- conv_error ();
+ do
+ {
+ c = inchar ();
+ if (c == EOF)
+ input_error ();
+ else if (c != *f++)
+ {
+ ungetc (c, s);
+ conv_error ();
+ }
+ }
+ while (--len > 0);
continue;
}
}
continue;
}
+ /* Read a character. */
+ c = inchar ();
+
/* Characters other than format specs must just match. */
if (c == EOF)
input_error ();
skip_space = 0;
}
- if (c == fc)
- (void) inchar ();
- else
- conv_error ();
+ if (c != fc)
+ {
+ ungetc (c, s);
+ conv_error ();
+ }
continue;
}
if (skip_space || (fc != '[' && fc != 'c' && fc != 'n'))
{
/* Eat whitespace. */
- while (isspace (c))
+ do
(void) inchar ();
+ while (isspace (c));
+ ungetc (c, s);
skip_space = 0;
}
switch (fc)
{
case '%': /* Must match a literal '%'. */
+ c = inchar ();
if (c != fc)
- conv_error ();
- inchar ();
+ {
+ ungetc (c, s);
+ conv_error ();
+ }
break;
case 'n': /* Answer number of assignments done. */
if (!(flags & SUPPRESS))
/* Don't count the read-ahead. */
if (flags & LONGDBL)
- *ARG (long long int *) = read_in - 1;
+ *ARG (long long int *) = read_in;
else if (flags & LONG)
- *ARG (long int *) = read_in - 1;
+ *ARG (long int *) = read_in;
else if (flags & SHORT)
- *ARG (short int *) = read_in - 1;
+ *ARG (short int *) = read_in;
else
- *ARG (int *) = read_in - 1;
+ *ARG (int *) = read_in;
break;
case 'c': /* Match characters. */
conv_error ();
}
+ c = inchar ();
if (c == EOF)
input_error ();
{
do
*str++ = c;
- while (inchar () != EOF && --width > 0);
+ while (--width > 0 && inchar () != EOF);
}
else
- while (inchar () != EOF && --width > 0);
+ while (--width > 0 && inchar () != EOF);
if (!(flags & SUPPRESS))
++done;
}
STRING_ARG;
+ c = inchar ();
if (c == EOF)
input_error ();
do
{
if (isspace (c))
- break;
+ {
+ ungetc (c, s);
+ break;
+ }
#define STRING_ADD_CHAR(c) \
if (!(flags & SUPPRESS)) \
{ \
} \
}
STRING_ADD_CHAR (c);
- } while (inchar () != EOF && (width <= 0 || --width > 0));
+ } while ((width <= 0 || --width > 0) && inchar () != EOF);
if (!(flags & SUPPRESS))
{
number_signed = 1;
number:
+ c = inchar ();
if (c == EOF)
input_error ();
ADDW (c);
if (width > 0)
--width;
- (void) inchar ();
+ c = inchar ();
}
/* Look for a leading indication of base. */
--width;
ADDW (c);
- (void) inchar ();
+ c = inchar ();
if (width != 0 && tolower (c) == 'x')
{
{
if (width > 0)
--width;
- (void) inchar ();
+ c = inchar ();
}
}
else if (base == 0)
if (width > 0)
--width;
- (void) inchar ();
+ c = inchar ();
}
+ /* The just read character is not part of the number anymore. */
+ ungetc (c, s);
+
if (wpsize == 0 ||
(wpsize == 1 && (wp[0] == '+' || wp[0] == '-')))
/* There was no number. */
case 'f':
case 'g':
case 'G':
+ c = inchar ();
if (c == EOF)
input_error ();
}
while (inchar () != EOF && width != 0);
+ /* The last read character is not part of the number anymore. */
+ ungetc (c, s);
+
if (wpsize == 0)
conv_error ();
case '[': /* Character class. */
STRING_ARG;
+ c = inchar ();
if (c == EOF)
- input_error();
+ input_error ();
if (*f == '^')
{
wp[fc] = 1;
}
if (fc == '\0')
- conv_error();
+ {
+ ungetc (c, s);
+ conv_error();
+ }
- num.ul = read_in;
+ num.ul = read_in - 1; /* -1 because we already read one char. */
do
{
if (wp[c] == not_in)
- break;
+ {
+ ungetc (c, s);
+ break;
+ }
STRING_ADD_CHAR (c);
if (width > 0)
--width;
}
- while (inchar () != EOF && width != 0);
+ while (width != 0 && inchar () != EOF);
+
if (read_in == num.ul)
conv_error ();
/* The last thing we saw int the format string was a white space.
Consume the last white spaces. */
if (skip_space)
- while (isspace (c))
- (void) inchar ();
+ {
+ do
+ c = inchar ();
+ while (isspace (c));
+ ungetc (c, s);
+ }
/* Unlock stream. */
funlockfile (s);
- return ((void) (c == EOF || ungetc (c, s)), done);
+ return done;
}
#ifdef USE_IN_LIBIO
# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
# Cambridge, MA 02139, USA.
-# This uses MIT assembler syntax. We have no convenient
-# way to choose a sysdep file based on MIT vs Motorola syntax.
-# No existing m68k ports use Motorola syntax.
-
-# Don't use crypt/crypt.sun3.S. It's not pic-clean.
-ifneq (yes,$(build-shared))
-crypt := crypt.sun3
-endif
-\f
# The mpn functions need this. All existing 68k ports use MIT syntax. If
# a new port wants to use Motorola or Sony syntax, it can redefine this
# variable.
-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
test ! -d CVS || cvs commit -m'Regenerated from $<' $@
sysdep-realclean := $(sysdep-realclean) $(divrem:%=sysdeps/sparc/%.S)
-\f
-ifeq ($(subdir),crypt)
-
-ifeq ($(crypt),crypt)
-crypt := crypt.sparc # Use crypt/crypt.sparc.S.
-endif
-
-endif # crypt
projects / platform / upstream / glibc.git / commitdiff