AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* 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.
This commit is contained in:
Ulrich Drepper 2003-09-06 09:56:14 +00:00
parent 483b8cc6cf
commit eb35b0972f
11 changed files with 219 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,3 +1,33 @@
2003-09-05 Roland McGrath <roland@redhat.com>
* 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>
* nss/getXXbyYY.c (FUNCTION_NAME): Remove unused variable.
@ -7,6 +37,7 @@
* sysdeps/mach/hurd/mmap.c (__mmap): If io_map fails with MIG_BAD_ID,
EOPNOTSUPP, or ENOSYS, change it to ENODEV.
>>>>>>> 1.7905
2003-09-04 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/ia64/bits/sigstack.h (MINSIGSTKSZ):
@ -30,7 +61,7 @@
* sysdeps/unix/sysv/linux/pathconf.c (__statfs_filesize_max):
Report correct value for vxfs.
* sysdeps/unix/sysv/linux/linux_fsinfo.h: Dfeine VXFS_SUPER_MAGIC.
* sysdeps/unix/sysv/linux/linux_fsinfo.h: Define VXFS_SUPER_MAGIC.
* gmon/gmon.c: Use only not-cancelable syscalls to write profiling
data.

4
libio/Makefile
View File

@ -53,7 +53,8 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof \
tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush
tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \
bug-ungetc2 bug-ftell
test-srcs = test-freopen
all: # Make this the default target; it will be defined in Rules.
@ -147,6 +148,7 @@ tst-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata
tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
tst-swscanf-ENV = LOCPATH=$(common-objpfx)localedata
bug-ftell-ENV = LOCPATH=$(common-objpfx)localedata
generated = tst-fopenloc.mtrace tst-fopenloc.check

56
libio/bug-ftell.c Normal file
View File

@ -0,0 +1,56 @@
#include <locale.h>
#include <stdio.h>
#include <wchar.h>
static int
do_test (void)
{
if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
{
puts ("setlocale failed");
return 1;
}
FILE *fp = tmpfile ();
if (fp == NULL)
{
puts ("tmpfile failed");
return 1;
}
if (fputws (L"hello", fp) == EOF)
{
puts ("fputws failed");
return 1;
}
rewind (fp);
wchar_t *cp;
unsigned int cnt;
for (cp = L"hello", cnt = 1; *cp != L'\0'; ++cp, ++cnt)
{
wint_t wc = fgetwc (fp);
if (wc != (wint_t) *cp)
{
printf ("fgetwc failed: got L'%lc', expected L'%lc'\n", wc, *cp);
return 1;
}
off_t o = ftello (fp);
if (o != cnt)
{
printf ("ftello failed: got %lu, expected %u\n",
(unsigned long int) o, cnt);
return 1;
}
printf ("round %u OK\n", cnt);
}
fclose (fp);
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

98
libio/bug-ungetc2.c Normal file
View File

@ -0,0 +1,98 @@
#include <stdio.h>
#include <sys/types.h>
static int
check (FILE *fp, off_t o)
{
int result = 0;
if (feof (fp))
{
puts ("feof !");
result = 1;
}
if (ferror (fp))
{
puts ("ferror !");
result = 1;
}
if (ftello (fp) != o)
{
printf ("position = %lu, not %lu\n", (unsigned long int) ftello (fp),
(unsigned long int) o);
result = 1;
}
return result;
}
static int
do_test (void)
{
FILE *fp = tmpfile ();
if (fp == NULL)
{
puts ("tmpfile failed");
return 1;
}
if (check (fp, 0) != 0)
return 1;
puts ("going to write");
if (fputs ("hello", fp) == EOF)
{
puts ("fputs failed");
return 1;
}
if (check (fp, 5) != 0)
return 1;
puts ("going to rewind");
rewind (fp);
if (check (fp, 0) != 0)
return 1;
puts ("going to read char");
int c = fgetc (fp);
if (c != 'h')
{
printf ("read %c, not %c\n", c, 'h');
return 1;
}
if (check (fp, 1) != 0)
return 1;
puts ("going to put back");
if (ungetc (' ', fp) == EOF)
{
puts ("ungetc failed");
return 1;
}
if (check (fp, 0) != 0)
return 1;
puts ("going to write again");
if (fputs ("world", fp) == EOF)
{
puts ("2nd fputs failed");
return 1;
}
if (check (fp, 5) != 0)
return 1;
puts ("going to rewind again");
rewind (fp);
if (check (fp, 0) != 0)
return 1;
if (fclose (fp) != 0)
{
puts ("fclose failed");
return 1;
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

16
libio/fileops.c
View File

@ -849,15 +849,13 @@ _IO_new_file_overflow (f, ch)
f->_IO_read_base - f->_IO_buf_base);
f->_IO_read_ptr = f->_IO_read_base;
}
else
{
if (f->_IO_read_ptr == f->_IO_buf_end)
f->_IO_read_end = f->_IO_read_ptr = f->_IO_buf_base;
f->_IO_write_ptr = f->_IO_read_ptr;
f->_IO_write_base = f->_IO_write_ptr;
f->_IO_write_end = f->_IO_buf_end;
f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end;
}
if (f->_IO_read_ptr == f->_IO_buf_end)
f->_IO_read_end = f->_IO_read_ptr = f->_IO_buf_base;
f->_IO_write_ptr = f->_IO_read_ptr;
f->_IO_write_base = f->_IO_write_ptr;
f->_IO_write_end = f->_IO_buf_end;
f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end;
f->_flags |= _IO_CURRENTLY_PUTTING;
if (f->_mode <= 0 && f->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED))

1
libio/wfileops.c
View File

@ -153,6 +153,7 @@ _IO_wfile_underflow (fp)
fp->_wide_data->_IO_buf_end,
&fp->_wide_data->_IO_read_end);
fp->_IO_read_base = fp->_IO_read_ptr;
fp->_IO_read_ptr = (char *) read_stop;
/* If we managed to generate some text return the next character. */

13
stdio-common/vfprintf.c
View File

@ -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;

10
stdio-common/vfscanf.c
View File

@ -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')

5
sysdeps/unix/sysv/linux/speed.c
View File

@ -1,5 +1,6 @@
/* `struct termios' speed frobnication functions. Linux version.
Copyright (C) 1991,92,93,95,96,97,98,2000,02 Free Software Foundation, Inc.
Copyright (C) 1991,1992,1993,1995,1996,1997,1998,2000,2002,2003
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
@ -66,6 +67,7 @@ cfsetospeed (termios_p, speed)
return -1;
}
termios_p->c_ospeed = speed;
termios_p->c_cflag &= ~(CBAUD | CBAUDEX);
termios_p->c_cflag |= speed;
@ -90,6 +92,7 @@ cfsetispeed (termios_p, speed)
return -1;
}
termios_p->c_ispeed = speed;
if (speed == 0)
termios_p->c_iflag |= IBAUD0;
else

4
sysdeps/unix/sysv/linux/tcgetattr.c
View File

@ -47,9 +47,13 @@ __tcgetattr (fd, termios_p)
termios_p->c_line = k_termios.c_line;
#ifdef _HAVE_C_ISPEED
termios_p->c_ispeed = k_termios.c_ispeed;
#else
termios_p->c_ispeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
#endif
#ifdef _HAVE_C_OSPEED
termios_p->c_ospeed = k_termios.c_ospeed;
#else
termios_p->c_ospeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
#endif
if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0
|| (unsigned char) _POSIX_VDISABLE == (unsigned char) -1)

9
sysdeps/unix/sysv/linux/tcsetattr.c
View File

@ -37,14 +37,7 @@
We use an unused bit in the `c_iflag' field to keep track of this
use of `cfsetispeed'. The value here must correspond to the one used
in `speed.c'. */
#if !defined _HAVE_C_ISPEED || !defined _HAVE_C_OSPEED
# define IBAUD0 020000000000
#else
/* If we have separate values for input and output speed don't bother
with this. Define the value as zero so the compiler sees we don't
have to do the AND below. */
# define IBAUD0 0
#endif
#define IBAUD0 020000000000
/* Set the state of FD to *TERMIOS_P. */