diff options
| author | deischen <deischen@FreeBSD.org> | 1999-08-05 12:08:10 +0000 |
|---|---|---|
| committer | deischen <deischen@FreeBSD.org> | 1999-08-05 12:08:10 +0000 |
| commit | 9161b0a7904cd5f5ec64dfebc31201ccdf41c2f9 (patch) | |
| tree | fded8c38645f1509bdaf35c512fd84076a5ce350 /lib/libc_r/uthread/uthread_fd.c | |
| parent | 4df48d07f1726a1f451ba70d0bcdd288e3c2803a (diff) | |
| download | FreeBSD-src-9161b0a7904cd5f5ec64dfebc31201ccdf41c2f9.zip FreeBSD-src-9161b0a7904cd5f5ec64dfebc31201ccdf41c2f9.tar.gz | |
Fix thread initialization to allow for the case where stdio file
descriptors are not opened.
PR: bin/12853
Reviewed by: jb
Diffstat (limited to 'lib/libc_r/uthread/uthread_fd.c')
| -rw-r--r-- | lib/libc_r/uthread/uthread_fd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c index f0c973b..6040a7b 100644 --- a/lib/libc_r/uthread/uthread_fd.c +++ b/lib/libc_r/uthread/uthread_fd.c @@ -20,7 +20,7 @@ * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: uthread_fd.c,v 1.10 1999/03/23 05:07:55 jb Exp $ + * $Id: uthread_fd.c,v 1.11 1999/06/20 08:28:18 jb Exp $ * */ #include <errno.h> @@ -94,13 +94,13 @@ _thread_fd_table_init(int fd) TAILQ_INIT(&entry->w_queue); /* Get the flags for the file: */ - if (fd >= 3 && (entry->flags = - _thread_sys_fcntl(fd, F_GETFL, 0)) == -1) { + if (((fd >= 3) || (_pthread_stdio_flags[fd] == -1)) && + (entry->flags = _thread_sys_fcntl(fd, F_GETFL, 0)) == -1) { ret = -1; - } + } else { /* Check if a stdio descriptor: */ - if (fd < 3) + if ((fd < 3) && (_pthread_stdio_flags[fd] != -1)) /* * Use the stdio flags read by * _pthread_init() to avoid |
