aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-26 08:08:50 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-26 08:08:50 +0000
commit442685a8ba011460eb27ad83855d05c9c9345aa6 (patch)
treee48e8bb958df68f389e3b9914acb17b1f5def480
parent34816665b678a06e096a378303b68d35ff10a693 (diff)
downloadglibc-442685a8ba011460eb27ad83855d05c9c9345aa6.tar
glibc-442685a8ba011460eb27ad83855d05c9c9345aa6.tar.gz
glibc-442685a8ba011460eb27ad83855d05c9c9345aa6.tar.bz2
glibc-442685a8ba011460eb27ad83855d05c9c9345aa6.zip
Update.
2002-08-26 Ulrich Drepper <drepper@redhat.com> * libio/wfileops.c (_IO_wfile_seekoff): Set fp->_offset after finding the read position [PR libc/4265]. * libio/Makefile (tests): Add bug-rewind2. * libio/bug-rewind2.c: New file.
-rw-r--r--ChangeLog7
-rw-r--r--libio/Makefile2
-rw-r--r--libio/bug-rewind.c20
-rw-r--r--libio/bug-rewind2.c62
-rw-r--r--libio/wfileops.c6
5 files changed, 90 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cd6bf6645..de56baf2ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-26 Ulrich Drepper <drepper@redhat.com>
+
+ * libio/wfileops.c (_IO_wfile_seekoff): Set fp->_offset after
+ finding the read position [PR libc/4265].
+ * libio/Makefile (tests): Add bug-rewind2.
+ * libio/bug-rewind2.c: New file.
+
2002-08-25 Ulrich Drepper <drepper@redhat.com>
* nss/getXXbyYY_r.c (REENTRANT_NAME): Return ENOENT if status is
diff --git a/libio/Makefile b/libio/Makefile
index 58d6575340..a6d3a24cc1 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -51,7 +51,7 @@ 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-atime tst-eof \
- tst-freopen bug-rewind bug-ungetc bug-fseek \
+ 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
test-srcs = test-freopen
diff --git a/libio/bug-rewind.c b/libio/bug-rewind.c
index 52bf38bccc..4f8242df3d 100644
--- a/libio/bug-rewind.c
+++ b/libio/bug-rewind.c
@@ -5,11 +5,26 @@
#define FAILED 3
+static int fd;
+
+static void prepare (void);
+#define PREPARE(argc, argv) prepare ()
+
+
#define TEST_FUNCTION do_test ()
static int do_test (void);
#include "../test-skeleton.c"
+static void
+prepare (void)
+{
+ fd = create_temp_file ("wrewind.", NULL);
+ if (fd == -1)
+ exit (3);
+}
+
+
static int
do_test (void)
{
@@ -17,11 +32,6 @@ do_test (void)
char arg1;
char arg2;
int ret1, ret2, result, num;
- int fd;
-
- fd = create_temp_file ("wrewind.", NULL);
- if (fd == -1)
- return 3;
ret1 = 0;
ret2 = 0;
diff --git a/libio/bug-rewind2.c b/libio/bug-rewind2.c
new file mode 100644
index 0000000000..51b5744330
--- /dev/null
+++ b/libio/bug-rewind2.c
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <wchar.h>
+
+
+static int fd;
+
+static void prepare (void);
+#define PREPARE(argc, argv) prepare ()
+
+
+#define TEST_FUNCTION do_test ()
+static int do_test (void);
+#include "../test-skeleton.c"
+
+
+static void
+prepare (void)
+{
+ fd = create_temp_file ("wrewind2.", NULL);
+ if (fd == -1)
+ exit (3);
+}
+
+
+static int
+do_test (void)
+{
+ wchar_t dummy[10];
+ int ret = 0;
+ FILE *fp;
+ int result = 0;
+
+ fp = fdopen (fd, "w+");
+ if (fp == NULL)
+ {
+ puts ("fopen(""testfile"", ""w+"") returned NULL.");
+ return 1;
+ }
+ else
+ {
+ fwprintf (fp, L"abcd");
+ printf ("current pos = %ld\n", ftell (fp));
+ if (ftell (fp) != 4)
+ result = 1;
+
+ rewind (fp);
+ ret = fwscanf (fp, L"%c", dummy);
+
+ printf ("current pos = %ld\n", ftell (fp));
+ if (ftell (fp) != 1)
+ result = 1;
+
+ rewind (fp);
+ printf ("current pos = %ld\n", ftell (fp));
+ if (ftell (fp) != 0)
+ result = 1;
+
+ fclose (fp);
+ }
+
+ return result;
+}
diff --git a/libio/wfileops.c b/libio/wfileops.c
index e9fe55bba5..02933b730e 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -674,7 +674,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
+ (sizeof (buffer)
/ sizeof (buffer[0])),
&ignore);
- if (status != __codecvt_ok && status != __codecvt_partial)
+ if (status != __codecvt_ok && status != __codecvt_partial)
{
fp->_flags |= _IO_ERR_SEEN;
goto dumb;
@@ -682,6 +682,10 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
}
while (read_ptr_copy != fp->_IO_read_ptr);
+ fp->_offset = (fp->_offset
+ - (fp->_IO_read_end - fp->_IO_read_base)
+ + rel_offset);
+
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end
= fp->_wide_data->_IO_read_base;