diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-07-31 20:32:01 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-07-31 20:32:01 +0000 |
| commit | ad71126b24491c31fd99b4ca8010cd1363f1c016 (patch) | |
| tree | b788d320c7c35e7b1eaca2e18973d55b3a5b2242 /libio/oldiopopen.c | |
| parent | 34183f57d75b4e8b9ed6608f888f0f1e1ada8b34 (diff) | |
| download | glibc-ad71126b24491c31fd99b4ca8010cd1363f1c016.tar.gz | |
Update.
* sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Correct
test for cmsg struct size.
* sysdeps/unix/sysv/linux/bits/socket.h (__cmsg_nxthdr): Likewise.
* sysdeps/unix/sysv/linux/i386/makecontext.S: Remove unnecessary
initializations.
* libio/oldiopopen.c: Add lock for old_proc_file_chain access.
Diffstat (limited to 'libio/oldiopopen.c')
| -rw-r--r-- | libio/oldiopopen.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c index ed4e3d241b..d18a2a4338 100644 --- a/libio/oldiopopen.c +++ b/libio/oldiopopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998,99,2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -109,6 +109,16 @@ typedef struct _IO_proc_file _IO_proc_file; static struct _IO_proc_file *old_proc_file_chain; +#ifdef _IO_MTSAFE_IO +static _IO_lock_t proc_file_chain_lock = _IO_lock_initializer; + +static void +unlock (void *not_used) +{ + _IO_lock_unlock (proc_file_chain_lock); +} +#endif + _IO_FILE * _IO_old_proc_open (fp, command, mode) _IO_FILE *fp; @@ -173,8 +183,16 @@ _IO_old_proc_open (fp, command, mode) _IO_fileno (fp) = parent_end; /* Link into old_proc_file_chain. */ +#ifdef _IO_MTSFE_IO + _IO_cleanup_region_start_noarg (unlock); + _IO_lock_lock (proc_file_chain_lock); +#endif ((_IO_proc_file *) fp)->next = old_proc_file_chain; old_proc_file_chain = (_IO_proc_file *) fp; +#ifdef _IO_MTSFE_IO + _IO_lock_unlock (proc_file_chain_lock); + _IO_cleanup_region_end (0); +#endif _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES); return fp; @@ -229,6 +247,10 @@ _IO_old_proc_close (fp) int status = -1; /* Unlink from old_proc_file_chain. */ +#ifdef _IO_MTSFE_IO + _IO_cleanup_region_start_noarg (unlock); + _IO_lock_lock (proc_file_chain_lock); +#endif for ( ; *ptr != NULL; ptr = &(*ptr)->next) { if (*ptr == (_IO_proc_file *) fp) @@ -238,6 +260,10 @@ _IO_old_proc_close (fp) break; } } +#ifdef _IO_MTSFE_IO + _IO_lock_unlock (proc_file_chain_lock); + _IO_cleanup_region_end (0); +#endif if (status < 0 || _IO_close (_IO_fileno(fp)) < 0) return -1; |