Update.

2002-10-03  Ulrich Drepper  <drepper@redhat.com>

	* libio/freopen.c: Don't re-set _wide_data element if the stream
	is of old style which didn't have the element.
	* libio/freopen64.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b9febc18a0289c9d4067a946da357593c08d2465..bfbebf5c771ca603f4229b1dcdf9deba191ffcec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-03  Ulrich Drepper  <drepper@redhat.com>
+
+       * libio/freopen.c: Don't re-set _wide_data element if the stream
+       is of old style which didn't have the element.
+       * libio/freopen64.c: Likewise.
+
 2002-10-02  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/x86_64/Dist: Add bits/utmpx.h.

diff --git a/libio/freopen.c b/libio/freopen.c
index 01816a179ab045a40aac590fcc369b23e78981b1..244a90d84e05f2d18eca6425bab5bd91ed465a03 100644 (file)
--- a/libio/freopen.c
+++ b/libio/freopen.c
@@ -68,7 +68,8 @@ freopen (filename, mode, fp)
     {
       INTUSE(_IO_file_close_it) (fp);
       _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &INTUSE(_IO_file_jumps);
-      fp->_wide_data->_wide_vtable = &INTUSE(_IO_wfile_jumps);
+      if (fp->_vtable_offset == 0 && fp->_wide_data != NULL)
+       fp->_wide_data->_wide_vtable = &INTUSE(_IO_wfile_jumps);
       result = INTUSE(_IO_file_fopen) (fp, filename, mode, 1);
       if (result != NULL)
        result = __fopen_maybe_mmap (result);

diff --git a/libio/freopen64.c b/libio/freopen64.c
index 7ab9bd315ac6e5ef7a129e1141eb4353002e09de..8f69fce2ce30dae445c7ff80e11eb86211ed7a82 100644 (file)
--- a/libio/freopen64.c
+++ b/libio/freopen64.c
@@ -54,7 +54,8 @@ freopen64 (filename, mode, fp)
     }
   INTUSE(_IO_file_close_it) (fp);
   _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &INTUSE(_IO_file_jumps);
-  fp->_wide_data->_wide_vtable = &INTUSE(_IO_wfile_jumps);
+  if (fp->_vtable_offset == 0 && fp->_wide_data != NULL)
+    fp->_wide_data->_wide_vtable = &INTUSE(_IO_wfile_jumps);
   result = INTUSE(_IO_file_fopen) (fp, filename, mode, 0);
   if (result != NULL)
     result = __fopen_maybe_mmap (result);