diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-11-04 09:58:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-11-04 09:58:57 +0000 |
| commit | 7ea113633e51579f6bbd3f03ab350fc8f8d0424f (patch) | |
| tree | 881e2afc1e7446847ff83c9c25d119c384cf688d /libio/oldiopopen.c | |
| parent | f0c76a28fd77c5045fe3d7c15bf4ecaae0273945 (diff) | |
Update.
2003-10-27 Daniel Jacobowitz <drow@mvista.com>
* libio/libioP.h [_IO_USE_OLD_IO_FILE]
(struct _IO_FILE_complete_plus): New type.
* libio/oldiofopen.c (_IO_old_fopen): Use _IO_FILE_complete_plus.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/oldiopopen.c (struct _IO_proc_file, _IO_old_popen): Likewise.
Call _IO_old_init instead of _IO_init.
Diffstat (limited to 'libio/oldiopopen.c')
| -rw-r--r-- | libio/oldiopopen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c index b818af4180..01e8efed08 100644 --- a/libio/oldiopopen.c +++ b/libio/oldiopopen.c @@ -100,7 +100,7 @@ extern int _IO_dup2 __P ((int fd, int fd2)); struct _IO_proc_file { - struct _IO_FILE_plus file; + struct _IO_FILE_complete_plus file; /* Following fields must match those in class procbuf (procbuf.h) */ _IO_pid_t pid; struct _IO_proc_file *next; @@ -219,18 +219,18 @@ _IO_old_popen (command, mode) if (new_f == NULL) return NULL; #ifdef _IO_MTSAFE_IO - new_f->fpx.file.file._lock = &new_f->lock; + new_f->fpx.file.file._file._lock = &new_f->lock; #endif - fp = &new_f->fpx.file.file; - INTUSE(_IO_init) (fp, 0); - _IO_JUMPS (&new_f->fpx.file) = &_IO_old_proc_jumps; - _IO_old_file_init (&new_f->fpx.file); + fp = &new_f->fpx.file.file._file; + _IO_old_init (fp, 0); + _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fpx.file) = &_IO_old_proc_jumps; + _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fpx.file); #if !_IO_UNIFIED_JUMPTABLES new_f->fpx.file.vtable = NULL; #endif if (_IO_old_proc_open (fp, command, mode) != NULL) return fp; - INTUSE(_IO_un_link) (&new_f->fpx.file); + INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fpx.file); free (new_f); return NULL; } |