aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
Diffstat (limited to 'libio')
-rw-r--r--libio/Makefile5
-rw-r--r--libio/fileops.c93
-rw-r--r--libio/genops.c3
-rw-r--r--libio/iofdopen.c33
-rw-r--r--libio/iofgets.c7
-rw-r--r--libio/iofopen.c18
-rw-r--r--libio/iofopen64.c16
-rw-r--r--libio/iogets.c7
-rw-r--r--libio/iolibio.h2
-rw-r--r--libio/iopopen.c4
-rw-r--r--libio/iovdprintf.c24
-rw-r--r--libio/libio.h21
-rw-r--r--libio/libioP.h41
-rw-r--r--libio/oldfileops.c3
-rw-r--r--libio/oldiofclose.c1
-rw-r--r--libio/oldiofdopen.c135
-rw-r--r--libio/oldiofopen.c1
-rw-r--r--libio/oldstdfiles.c29
-rw-r--r--libio/stdfiles.c21
-rw-r--r--libio/stdio.c6
20 files changed, 332 insertions, 138 deletions
diff --git a/libio/Makefile b/libio/Makefile
index f3a66f32ca..0997b5d8bf 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -43,7 +43,7 @@ all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig
ifeq ($(versioning),yes)
-routines += oldiofopen oldiofclose
+routines += oldiofopen oldiofclose oldiofclose
endif
CPPFLAGS-.o += -DIO_DEBUG
@@ -62,7 +62,8 @@ ifeq ($(versioning),yes)
aux += oldfileops oldstdfiles
endif
-shared-only-routines = oldiofopen oldiofclose oldfileops oldstdfiles
+shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops \
+ oldstdfiles
distribute := iolibio.h libioP.h strfile.h Banner
diff --git a/libio/fileops.c b/libio/fileops.c
index a0cc2f7d0e..d2377af73b 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -108,11 +108,10 @@ void
_IO_file_init (fp)
_IO_FILE *fp;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
/* POSIX.1 allows another file handle to be used to change the position
of our file descriptor. Hence we actually don't know the actual
position before we do the first fseek (and until a following fflush). */
- fc->_offset = _IO_pos_BAD;
+ fp->_offset = _IO_pos_BAD;
fp->_IO_file_flags |= CLOSED_FILEBUF_FLAGS;
_IO_link_in(fp);
@@ -123,7 +122,6 @@ int
_IO_file_close_it (fp)
_IO_FILE *fp;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
int write_status, close_status;
if (!_IO_file_is_open (fp))
return EOF;
@@ -142,7 +140,7 @@ _IO_file_close_it (fp)
_IO_un_link (fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
fp->_fileno = EOF;
- fc->_offset = _IO_pos_BAD;
+ fp->_offset = _IO_pos_BAD;
return close_status ? close_status : write_status;
}
@@ -161,6 +159,38 @@ _IO_file_finish (fp, dummy)
_IO_default_finish (fp, 0);
}
+#if defined __GNUC__ && __GNUC__ >= 2
+__inline__
+#endif
+_IO_FILE *
+_IO_file_open (fp, filename, posix_mode, prot, read_write, is32not64)
+ _IO_FILE *fp;
+ const char *filename;
+ int posix_mode;
+ int prot;
+ int read_write;
+ int is32not64;
+{
+ int fdesc;
+#ifdef _G_OPEN64
+ fdesc = (is32not64
+ ? open (filename, posix_mode, prot)
+ : _G_OPEN64 (filename, posix_mode, prot));
+#else
+ fdesc = open (filename, posix_mode, prot);
+#endif
+ if (fdesc < 0)
+ return NULL;
+ fp->_fileno = fdesc;
+ _IO_mask_flags (fp, read_write,_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
+ if (read_write & _IO_IS_APPENDING)
+ if (_IO_SEEKOFF (fp, (_IO_off64_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT)
+ == _IO_pos_BAD && errno != ESPIPE)
+ return NULL;
+ _IO_link_in (fp);
+ return fp;
+}
+
_IO_FILE *
_IO_file_fopen (fp, filename, mode, is32not64)
_IO_FILE *fp;
@@ -169,7 +199,7 @@ _IO_file_fopen (fp, filename, mode, is32not64)
int is32not64;
{
int oflags = 0, omode;
- int read_write, fdesc;
+ int read_write;
int oprot = 0666;
if (_IO_file_is_open (fp))
return 0;
@@ -198,23 +228,8 @@ _IO_file_fopen (fp, filename, mode, is32not64)
omode = O_RDWR;
read_write &= _IO_IS_APPENDING;
}
-#ifdef _G_OPEN64
- fdesc = (is32not64
- ? open (filename, omode|oflags, oprot)
- : _G_OPEN64 (filename, omode|oflags, oprot));
-#else
- fdesc = open (filename, omode|oflags, oprot);
-#endif
- if (fdesc < 0)
- return NULL;
- fp->_fileno = fdesc;
- _IO_mask_flags (fp, read_write,_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
- if (read_write & _IO_IS_APPENDING)
- if (_IO_SEEKOFF (fp, (_IO_off64_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT)
- == _IO_pos_BAD && errno != ESPIPE)
- return NULL;
- _IO_link_in (fp);
- return fp;
+ return _IO_file_open (fp, filename, omode|oflags, oprot, read_write,
+ is32not64);
}
_IO_FILE *
@@ -222,7 +237,6 @@ _IO_file_attach (fp, fd)
_IO_FILE *fp;
int fd;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
if (_IO_file_is_open (fp))
return NULL;
fp->_fileno = fd;
@@ -230,7 +244,7 @@ _IO_file_attach (fp, fd)
fp->_flags |= _IO_DELETE_DONT_CLOSE;
/* Get the current position of the file. */
/* We have to do that since that may be junk. */
- fc->_offset = _IO_pos_BAD;
+ fp->_offset = _IO_pos_BAD;
if (_IO_SEEKOFF (fp, (_IO_off64_t)0, _IO_seek_cur, _IOS_INPUT|_IOS_OUTPUT)
== _IO_pos_BAD && errno != ESPIPE)
return NULL;
@@ -262,7 +276,6 @@ _IO_do_write (fp, data, to_do)
const char *data;
_IO_size_t to_do;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
_IO_size_t count;
if (to_do == 0)
return 0;
@@ -272,14 +285,14 @@ _IO_do_write (fp, data, to_do)
is not needed nor desirable for Unix- or Posix-like systems.
Instead, just indicate that offset (before and after) is
unpredictable. */
- fc->_offset = _IO_pos_BAD;
+ fp->_offset = _IO_pos_BAD;
else if (fp->_IO_read_end != fp->_IO_write_base)
{
_IO_fpos64_t new_pos
= _IO_SYSSEEK (fp, fp->_IO_write_base - fp->_IO_read_end, 1);
if (new_pos == _IO_pos_BAD)
return EOF;
- fc->_offset = new_pos;
+ fp->_offset = new_pos;
}
count = _IO_SYSWRITE (fp, data, to_do);
if (fp->_cur_column)
@@ -295,7 +308,6 @@ int
_IO_file_underflow (fp)
_IO_FILE *fp;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
_IO_ssize_t count;
#if 0
/* SysV does not make this test; take it out for compatibility */
@@ -342,8 +354,8 @@ _IO_file_underflow (fp)
fp->_IO_read_end += count;
if (count == 0)
return EOF;
- if (fc->_offset != _IO_pos_BAD)
- _IO_pos_adjust (fc->_offset, count);
+ if (fp->_offset != _IO_pos_BAD)
+ _IO_pos_adjust (fp->_offset, count);
return *(unsigned char *) fp->_IO_read_ptr;
}
@@ -402,7 +414,6 @@ int
_IO_file_sync (fp)
_IO_FILE *fp;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
_IO_size_t delta;
int retval = 0;
@@ -429,7 +440,7 @@ _IO_file_sync (fp)
retval = EOF;
}
if (retval != EOF)
- fc->_offset = _IO_pos_BAD;
+ fp->_offset = _IO_pos_BAD;
/* FIXME: Cleanup - can this be shared? */
/* setg(base(), ptr, ptr); */
_IO_cleanup_region_end (1);
@@ -443,7 +454,6 @@ _IO_file_seekoff (fp, offset, dir, mode)
int dir;
int mode;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) fp;
_IO_fpos64_t result;
_IO_off64_t delta, new_offset;
long count;
@@ -479,10 +489,10 @@ _IO_file_seekoff (fp, offset, dir, mode)
case _IO_seek_cur:
/* Adjust for read-ahead (bytes is buffer). */
offset -= fp->_IO_read_end - fp->_IO_read_ptr;
- if (fc->_offset == _IO_pos_BAD)
+ if (fp->_offset == _IO_pos_BAD)
goto dumb;
/* Make offset absolute, assuming current pointer is file_ptr(). */
- offset += _IO_pos_as_off (fc->_offset);
+ offset += _IO_pos_as_off (fp->_offset);
dir = _IO_seek_set;
break;
@@ -503,11 +513,11 @@ _IO_file_seekoff (fp, offset, dir, mode)
/* At this point, dir==_IO_seek_set. */
/* If destination is within current buffer, optimize: */
- if (fc->_offset != _IO_pos_BAD && fp->_IO_read_base != NULL
+ if (fp->_offset != _IO_pos_BAD && fp->_IO_read_base != NULL
&& !_IO_in_backup (fp))
{
/* Offset relative to start of main get area. */
- _IO_fpos64_t rel_offset = (offset - fc->_offset
+ _IO_fpos64_t rel_offset = (offset - fp->_offset
+ (fp->_IO_read_end - fp->_IO_read_base));
if (rel_offset >= 0)
{
@@ -581,7 +591,7 @@ _IO_file_seekoff (fp, offset, dir, mode)
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base + delta,
fp->_IO_buf_base + count);
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
- fc->_offset = result + count;
+ fp->_offset = result + count;
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
return offset;
dumb:
@@ -590,7 +600,7 @@ _IO_file_seekoff (fp, offset, dir, mode)
result = _IO_SYSSEEK (fp, offset, dir);
if (result != EOF)
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
- fc->_offset = result;
+ fp->_offset = result;
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
return result;
@@ -643,7 +653,6 @@ _IO_file_write (f, data, n)
const void *data;
_IO_ssize_t n;
{
- struct _IO_FILE_complete *fc = (struct _IO_FILE_complete *) f;
_IO_ssize_t to_do = n;
while (to_do > 0)
{
@@ -657,8 +666,8 @@ _IO_file_write (f, data, n)
data = (void *) ((char *) data + count);
}
n -= to_do;
- if (fc->_offset >= 0)
- fc->_offset += n;
+ if (f->_offset >= 0)
+ f->_offset += n;
return n;
}
diff --git a/libio/genops.c b/libio/genops.c
index 3776b9e332..ea602eda39 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -531,6 +531,9 @@ _IO_init (fp, flags)
fp->_IO_save_end = NULL;
fp->_markers = NULL;
fp->_cur_column = 0;
+#if _IO_JUMPS_OFFSET
+ fp->_vtable_offset = 0;
+#endif
#ifdef _IO_MTSAFE_IO
_IO_lock_init (*fp->_lock);
#endif
diff --git a/libio/iofdopen.c b/libio/iofdopen.c
index b6508255d0..2ecbce3ad0 100644
--- a/libio/iofdopen.c
+++ b/libio/iofdopen.c
@@ -34,7 +34,7 @@
#endif
_IO_FILE *
-_IO_fdopen (fd, mode)
+_IO_new_fdopen (fd, mode)
int fd;
const char *mode;
{
@@ -42,7 +42,7 @@ _IO_fdopen (fd, mode)
int posix_mode = 0;
struct locked_FILE
{
- struct _IO_FILE_complete fp;
+ struct _IO_FILE_plus fp;
#ifdef _IO_MTSAFE_IO
_IO_lock_t lock;
#endif
@@ -106,29 +106,36 @@ _IO_fdopen (fd, mode)
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->fp.plus.file._lock = &new_f->lock;
+ new_f->fp.file._lock = &new_f->lock;
#endif
- _IO_init (&new_f->fp.plus.file, 0);
- _IO_JUMPS (&new_f->fp.plus.file) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.plus.file);
+ _IO_init (&new_f->fp.file, 0);
+ _IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
+ _IO_file_init (&new_f->fp.file);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (_IO_file_attach (&new_f->fp.plus.file, fd) == NULL)
+ if (_IO_file_attach (&new_f->fp.file, fd) == NULL)
{
- _IO_un_link (&new_f->fp.plus.file);
+ _IO_un_link (&new_f->fp.file);
free (new_f);
return NULL;
}
- new_f->fp.plus.file._flags &= ~_IO_DELETE_DONT_CLOSE;
+ new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE;
- new_f->fp.plus.file._IO_file_flags =
- _IO_mask_flags (&new_f->fp.plus.file, read_write,
+ new_f->fp.file._IO_file_flags =
+ _IO_mask_flags (&new_f->fp.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
return (_IO_FILE *) &new_f->fp;
}
-#ifdef weak_alias
-weak_alias (_IO_fdopen, fdopen)
+#ifdef DO_VERSIONING
+strong_alias (_IO_new_fdopen, __new_fdopen)
+default_symbol_version (_IO_new_fdopen, _IO_fdopen, GLIBC_2.1);
+default_symbol_version (__new_fdopen, fdopen, GLIBC_2.1);
+#else
+# ifdef weak_alias
+weak_alias (_IO_new_fdopen, _IO_fdopen)
+weak_alias (_IO_new_fdopen, fdopen)
+# endif
#endif
diff --git a/libio/iofgets.c b/libio/iofgets.c
index 74754d5d1e..91db09f342 100644
--- a/libio/iofgets.c
+++ b/libio/iofgets.c
@@ -34,11 +34,17 @@ _IO_fgets (buf, n, fp)
{
_IO_size_t count;
char *result;
+ int old_error;
CHECK_FILE (fp, NULL);
if (n <= 0)
return NULL;
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
_IO_flockfile (fp);
+ /* This is very tricky since a file descriptor may be in the
+ non-blocking mode. The error flag doesn't mean much in this
+ case. We return an error only when there is a new error. */
+ old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
+ fp->_IO_file_flags &= ~_IO_ERR_SEEN;
count = _IO_getline (fp, buf, n - 1, '\n', 1);
if (count == 0 || (fp->_IO_file_flags & _IO_ERR_SEEN))
result = NULL;
@@ -47,6 +53,7 @@ _IO_fgets (buf, n, fp)
buf[count] = '\0';
result = buf;
}
+ fp->_IO_file_flags |= old_error;
_IO_cleanup_region_end (1);
return result;
}
diff --git a/libio/iofopen.c b/libio/iofopen.c
index 59d1ce571e..41da8f1721 100644
--- a/libio/iofopen.c
+++ b/libio/iofopen.c
@@ -35,7 +35,7 @@ _IO_new_fopen (filename, mode)
{
struct locked_FILE
{
- struct _IO_FILE_complete fp;
+ struct _IO_FILE_plus fp;
#ifdef _IO_MTSAFE_IO
_IO_lock_t lock;
#endif
@@ -44,17 +44,17 @@ _IO_new_fopen (filename, mode)
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->fp.plus.file._lock = &new_f->lock;
+ new_f->fp.file._lock = &new_f->lock;
#endif
- _IO_init (&new_f->fp.plus.file, 0);
- _IO_JUMPS (&new_f->fp.plus.file) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.plus.file);
+ _IO_init (&new_f->fp.file, 0);
+ _IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
+ _IO_file_init (&new_f->fp.file);
#if !_IO_UNIFIED_JUMPTABLES
- new_f->fp.plus.vtable = NULL;
+ new_f->fp.vtable = NULL;
#endif
- if (_IO_file_fopen (&new_f->fp.plus.file, filename, mode, 0) != NULL)
- return (_IO_FILE *) &new_f->fp.plus;
- _IO_un_link (&new_f->fp.plus.file);
+ if (_IO_file_fopen (&new_f->fp.file, filename, mode, 0) != NULL)
+ return (_IO_FILE *) &new_f->fp;
+ _IO_un_link (&new_f->fp.file);
free (new_f);
return NULL;
}
diff --git a/libio/iofopen64.c b/libio/iofopen64.c
index fc6ccc0b92..3572295ad8 100644
--- a/libio/iofopen64.c
+++ b/libio/iofopen64.c
@@ -36,7 +36,7 @@ _IO_fopen64 (filename, mode)
#ifdef _G_OPEN64
struct locked_FILE
{
- struct _IO_FILE_complete fp;
+ struct _IO_FILE_plus fp;
#ifdef _IO_MTSAFE_IO
_IO_lock_t lock;
#endif
@@ -45,17 +45,17 @@ _IO_fopen64 (filename, mode)
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->fp.plus.file._lock = &new_f->lock;
+ new_f->fp.file._lock = &new_f->lock;
#endif
- _IO_init (&new_f->fp.plus.file, 0);
- _IO_JUMPS (&new_f->fp.plus.file) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.plus.file);
+ _IO_init (&new_f->fp.file, 0);
+ _IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
+ _IO_file_init (&new_f->fp.file);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.plus.vtable = NULL;
#endif
- if (_IO_file_fopen (&new_f->fp.plus.file, filename, mode, 1) != NULL)
- return (_IO_FILE *) &new_f->fp.plus;
- _IO_un_link (&new_f->fp.plus.file);
+ if (_IO_file_fopen (&new_f->fp.file, filename, mode, 1) != NULL)
+ return (_IO_FILE *) &new_f->fp;
+ _IO_un_link (&new_f->fp.file);
free (new_f);
return NULL;
#else
diff --git a/libio/iogets.c b/libio/iogets.c
index 9e88ca1037..a61699d694 100644
--- a/libio/iogets.c
+++ b/libio/iogets.c
@@ -47,6 +47,11 @@ _IO_gets (buf)
count = 0;
else
{
+ /* This is very tricky since a file descriptor may be in the
+ non-blocking mode. The error flag doesn't mean much in this
+ case. We return an error only when there is a new error. */
+ int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN;
+ _IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN;
buf[0] = (char) ch;
count = _IO_getline (_IO_stdin, buf + 1, INT_MAX, '\n', 0) + 1;
if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN)
@@ -54,6 +59,8 @@ _IO_gets (buf)
retval = NULL;
goto unlock_return;
}
+ else
+ _IO_stdin->_IO_file_flags |= old_error;
}
buf[count] = 0;
retval = buf;
diff --git a/libio/iolibio.h b/libio/iolibio.h
index 1eef384fa8..ec54d639a6 100644
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -11,6 +11,8 @@ extern int _IO_fclose __P((_IO_FILE*));
extern int _IO_new_fclose __P((_IO_FILE*));
extern int _IO_old_fclose __P((_IO_FILE*));
extern _IO_FILE *_IO_fdopen __P((int, const char*));
+extern _IO_FILE *_IO_old_fdopen __P((int, const char*));
+extern _IO_FILE *_IO_new_fdopen __P((int, const char*));
extern int _IO_fflush __P((_IO_FILE*));
extern int _IO_fgetpos __P((_IO_FILE*, _IO_fpos_t*));
extern int _IO_fgetpos64 __P((_IO_FILE*, _IO_fpos64_t*));
diff --git a/libio/iopopen.c b/libio/iopopen.c
index a03cf636b2..3d2a79635d 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -74,7 +74,7 @@ extern int _IO_dup2 __P ((int fd, int fd2));
struct _IO_proc_file
{
- struct _IO_FILE_complete file;
+ struct _IO_FILE_plus file;
/* Following fields must match those in class procbuf (procbuf.h) */
_IO_pid_t pid;
struct _IO_proc_file *next;
@@ -174,7 +174,7 @@ _IO_popen (command, mode)
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->fpx.file.plus.file._lock = &new_f->lock;
+ new_f->fpx.file.file._lock = &new_f->lock;
#endif
fp = (_IO_FILE*)&new_f->fpx;
_IO_init (fp, 0);
diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c
index 04b40e7553..a24d3b535e 100644
--- a/libio/iovdprintf.c
+++ b/libio/iovdprintf.c
@@ -32,35 +32,35 @@ _IO_vdprintf (d, format, arg)
const char *format;
_IO_va_list arg;
{
- struct _IO_FILE_complete tmpfil;
+ struct _IO_FILE_plus tmpfil;
#ifdef _IO_MTSAFE_IO
_IO_lock_t lock;
#endif
int done;
#ifdef _IO_MTSAFE_IO
- tmpfil.plus.file._lock = &lock;
+ tmpfil.file._lock = &lock;
#endif
- _IO_init (&tmpfil.plus.file, 0);
- _IO_JUMPS (&tmpfil.plus.file) = &_IO_file_jumps;
- _IO_file_init (&tmpfil.plus.file);
+ _IO_init (&tmpfil.file, 0);
+ _IO_JUMPS (&tmpfil.file) = &_IO_file_jumps;
+ _IO_file_init (&tmpfil.file);
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
- if (_IO_file_attach (&tmpfil.plus.file, d) == NULL)
+ if (_IO_file_attach (&tmpfil.file, d) == NULL)
{
- _IO_un_link (&tmpfil.plus.file);
+ _IO_un_link (&tmpfil.file);
return EOF;
}
- tmpfil.plus.file._flags &= ~_IO_DELETE_DONT_CLOSE;
+ tmpfil.file._flags &= ~_IO_DELETE_DONT_CLOSE;
- tmpfil.plus.file._IO_file_flags =
- _IO_mask_flags (&tmpfil.plus.file, _IO_NO_READS,
+ tmpfil.file._IO_file_flags =
+ _IO_mask_flags (&tmpfil.file, _IO_NO_READS,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
- done = _IO_vfprintf (&tmpfil.plus.file, format, arg);
+ done = _IO_vfprintf (&tmpfil.file, format, arg);
- _IO_FINISH (&tmpfil.plus.file);
+ _IO_FINISH (&tmpfil.file);
return done;
}
diff --git a/libio/libio.h b/libio/libio.h
index 0c12ff0dc6..f6b3b22899 100644
--- a/libio/libio.h