mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
Update.
* libio/fileops.c (_IO_file_xsgetn_mmap): Always set EOF flag is not enough content is available. * libio/tst-eof.c: New file. * libio/Makefile (tests): Add tst-eof. * libio/fileops.c (_IO_file_underflow_mmap): Read a single byte to update atime. * libio/tst-atime.c: New file. * libio/Makefile (tests): Add tst-atime.
This commit is contained in:
parent
51909ff7bf
commit
c429248993
10
ChangeLog
10
ChangeLog
@ -1,5 +1,15 @@
|
||||
2002-06-25 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* libio/fileops.c (_IO_file_xsgetn_mmap): Always set EOF flag is
|
||||
not enough content is available.
|
||||
* libio/tst-eof.c: New file.
|
||||
* libio/Makefile (tests): Add tst-eof.
|
||||
|
||||
* libio/fileops.c (_IO_file_underflow_mmap): Read a single byte to
|
||||
update atime.
|
||||
* libio/tst-atime.c: New file.
|
||||
* libio/Makefile (tests): Add tst-atime.
|
||||
|
||||
* argp/argp-fmtstream.c (__argp_fmtstream_update): Avoid crash in
|
||||
handling of overly long words.
|
||||
|
||||
|
@ -49,7 +49,7 @@ routines := \
|
||||
tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
|
||||
tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-fopenloc \
|
||||
tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \
|
||||
tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2
|
||||
tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof
|
||||
test-srcs = test-freopen
|
||||
|
||||
all: # Make this the default target; it will be defined in Rules.
|
||||
|
@ -608,6 +608,13 @@ _IO_file_underflow_mmap (_IO_FILE *fp)
|
||||
{
|
||||
if (fp->_IO_read_end < fp->_IO_buf_end)
|
||||
{
|
||||
/* A stupid requirement in POSIX says that the first read on a
|
||||
stream must update the atime. Just read a single byte. We
|
||||
don't have to worry about repositioning the file descriptor
|
||||
since the following seek defines its position anyway. */
|
||||
char ignore[1];
|
||||
read (fp->_fileno, ignore, 1);
|
||||
|
||||
if (
|
||||
# ifdef _G_LSEEK64
|
||||
_G_LSEEK64 (fp->_fileno, fp->_IO_buf_end - fp->_IO_buf_base,
|
||||
@ -1262,12 +1269,10 @@ _IO_file_xsgetn_mmap (fp, data, n)
|
||||
}
|
||||
}
|
||||
|
||||
if (have == 0)
|
||||
{
|
||||
if (s == (char *) data)
|
||||
fp->_flags |= _IO_EOF_SEEN;
|
||||
}
|
||||
else
|
||||
if (have < n)
|
||||
fp->_flags |= _IO_EOF_SEEN;
|
||||
|
||||
if (have != 0)
|
||||
{
|
||||
have = MIN (have, n);
|
||||
#ifdef _LIBC
|
||||
|
97
libio/tst-atime.c
Normal file
97
libio/tst-atime.c
Normal file
@ -0,0 +1,97 @@
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
|
||||
static int do_test (void);
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#define TIMEOUT 5
|
||||
#include <test-skeleton.c>
|
||||
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
char *buf;
|
||||
int fd;
|
||||
FILE *fp;
|
||||
int ch;
|
||||
struct stat st1;
|
||||
struct stat st2;
|
||||
|
||||
buf = (char *) malloc (strlen (test_dir) + sizeof "/tst-atime.XXXXXX");
|
||||
if (buf == NULL)
|
||||
{
|
||||
printf ("cannot allocate memory: %m\n");
|
||||
return 1;
|
||||
}
|
||||
stpcpy (stpcpy (buf, test_dir), "/tst-atime.XXXXXX");
|
||||
|
||||
fd = mkstemp (buf);
|
||||
if (fd == -1)
|
||||
{
|
||||
printf ("cannot open temporary file: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Make sure it gets removed. */
|
||||
add_temp_file (buf);
|
||||
|
||||
if (write (fd, "some string\n", 12) != 12)
|
||||
{
|
||||
printf ("cannot write temporary file: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (lseek (fd, 0, SEEK_SET) == (off_t) -1)
|
||||
{
|
||||
printf ("cannot reposition temporary file: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
fp = fdopen (fd, "r");
|
||||
if (fp == NULL)
|
||||
{
|
||||
printf ("cannot create stream: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (fstat (fd, &st1) == -1)
|
||||
{
|
||||
printf ("first stat failed: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
sleep (2);
|
||||
|
||||
ch = fgetc (fp);
|
||||
if (ch != 's')
|
||||
{
|
||||
printf ("did not read correct character: got '%c', expected 's'\n", ch);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (fstat (fd, &st2) == -1)
|
||||
{
|
||||
printf ("second stat failed: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (st1.st_atime > st2.st_atime)
|
||||
{
|
||||
puts ("second atime smaller");
|
||||
return 1;
|
||||
}
|
||||
else if (st1.st_atime == st2.st_atime)
|
||||
{
|
||||
puts ("atime has not changed");
|
||||
return 1;
|
||||
}
|
||||
|
||||
fclose (fp);
|
||||
|
||||
return 0;
|
||||
}
|
79
libio/tst-eof.c
Normal file
79
libio/tst-eof.c
Normal file
@ -0,0 +1,79 @@
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
static int do_test (void);
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include <test-skeleton.c>
|
||||
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
char *buf;
|
||||
int fd;
|
||||
FILE *fp;
|
||||
int ch;
|
||||
char tm[20];
|
||||
|
||||
buf = (char *) malloc (strlen (test_dir) + sizeof "/tst-eof.XXXXXX");
|
||||
if (buf == NULL)
|
||||
{
|
||||
printf ("cannot allocate memory: %m\n");
|
||||
return 1;
|
||||
}
|
||||
stpcpy (stpcpy (buf, test_dir), "/tst-eof.XXXXXX");
|
||||
|
||||
fd = mkstemp (buf);
|
||||
if (fd == -1)
|
||||
{
|
||||
printf ("cannot open temporary file: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Make sure it gets removed. */
|
||||
add_temp_file (buf);
|
||||
|
||||
if (write (fd, "some string\n", 12) != 12)
|
||||
{
|
||||
printf ("cannot write temporary file: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (lseek (fd, 0, SEEK_SET) == (off_t) -1)
|
||||
{
|
||||
printf ("cannot reposition temporary file: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
fp = fdopen (fd, "r");
|
||||
if (fp == NULL)
|
||||
{
|
||||
printf ("cannot create stream: %m\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (feof (fp))
|
||||
{
|
||||
puts ("EOF set after fdopen");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (fread (buf, 1, 20, fp) != 12)
|
||||
{
|
||||
puts ("didn't read the correct number of bytes");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (! feof (fp))
|
||||
{
|
||||
puts ("EOF not set after fread");
|
||||
return 1;
|
||||
}
|
||||
|
||||
fclose (fp);
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user