aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:14 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:14 +0000
commiteb35b0972f174cd58f118737c2935653309df7e9 (patch)
treef61603e4b104c032b3ce7b4293eb9fe38901b6ee /stdio-common
parent483b8cc6cfd531611f6141b288a5e16e8010905c (diff)
downloadglibc-eb35b0972f174cd58f118737c2935653309df7e9.zip
glibc-eb35b0972f174cd58f118737c2935653309df7e9.tar.gz
glibc-eb35b0972f174cd58f118737c2935653309df7e9.tar.bz2
Update.
* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Fill in c_ispeed and c_ospeed fields. * sysdeps/unix/sysv/linux/speed.c (cfsetospeed): Set c_ospeed field. (cfsetispeed): Set c_ispeed field. * sysdeps/unix/sysv/linux/tcsetattr.c (IBAUD0): Define unconditionally to match corresponding speed.c code. 2003-09-06 Ulrich Drepper <drepper@redhat.com> * libio/wfileops.c (_IO_wfile_underflow): Mark beginning of the narrow character buffer. * libio/Makefile: Add rules to build and run bug-ftell. * libio/bug-ftell.c: New file. * stdio-common/vfprintf.c: Don't use the first grouping number twice. * stdio-common/vfscanf.c (vfscanf): Fix recognition of characters matching the decimal point and possibly leading the thousands separator. This caused the recognition of thousands separators to always fail. 2003-09-05 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_new_file_overflow): Handle switching to write mode from read in backup buffer. * libio/Makefile (tests): Add bug-ungetc2. * libio/bug-ungetc2.c: New file. 2003-09-05 Roland McGrath <roland@redhat.com> >>>>>>> 1.7905 * sysdeps/unix/sysv/linux/linux_fsinfo.h: Define VXFS_SUPER_MAGIC.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/vfprintf.c13
-rw-r--r--stdio-common/vfscanf.c10
2 files changed, 13 insertions, 10 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index bcff971..0833303 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1992,7 +1992,7 @@ group_number (CHAR_T *w, CHAR_T *rear_ptr, const char *grouping,
/* No grouping should be done. */
return w;
- len = *grouping;
+ len = *grouping++;
/* Copy existing string so that nothing gets overwritten. */
src = (CHAR_T *) alloca ((rear_ptr - w) * sizeof (CHAR_T));
@@ -2017,11 +2017,7 @@ group_number (CHAR_T *w, CHAR_T *rear_ptr, const char *grouping,
while (cnt > 0);
#endif
- len = *grouping++;
- if (*grouping == '\0')
- /* The previous grouping repeats ad infinitum. */
- --grouping;
- else if (*grouping == CHAR_MAX
+ if (*grouping == CHAR_MAX
#if CHAR_MIN < 0
|| *grouping < 0
#endif
@@ -2034,6 +2030,11 @@ group_number (CHAR_T *w, CHAR_T *rear_ptr, const char *grouping,
while (s > src);
break;
}
+ else if (*grouping != '\0')
+ /* The previous grouping repeats ad infinitum. */
+ len = *grouping++;
+ else
+ len = grouping[-1];
}
}
return w;
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 4f6a531..75e187b 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1776,7 +1776,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
ADDW (c);
got_dot = 1;
}
- else if (thousands != L'\0' && ! got_dot && c == thousands)
+ else if ((flags & GROUP) != 0 && thousands != L'\0'
+ && ! got_dot && c == thousands)
ADDW (c);
else
{
@@ -1820,12 +1821,13 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
we can compare against it. */
const char *cmp2p = thousands;
- if (thousands != NULL && ! got_dot)
+ if ((flags & GROUP) != 0 && thousands != NULL
+ && ! got_dot)
{
- while (cmp2p < cmpp
+ while (cmp2p - thousands < cmpp - decimal
&& *cmp2p == decimal[cmp2p - thousands])
++cmp2p;
- if (cmp2p == cmpp)
+ if (cmp2p - thousands == cmpp - decimal)
{
while ((unsigned char) *cmp2p == c && avail > 0)
if (*++cmp2p == '\0')