diff options
| author | craigm <none@none> | 2006-04-20 08:17:22 -0700 |
|---|---|---|
| committer | craigm <none@none> | 2006-04-20 08:17:22 -0700 |
| commit | a5f69788de7ac07553de47f7fec8c05a9a94c105 (patch) | |
| tree | 2004e6a579b5b69b2edd0a65453e5a2d7d174f4f /usr/src/lib/libc/port/stdio/setvbuf.c | |
| parent | 9c6cb9fca0da6c80b32c97869c5672999211da26 (diff) | |
| download | illumos-gate-a5f69788de7ac07553de47f7fec8c05a9a94c105.tar.gz | |
PSARC 2006/162 Extended FILE space for 32-bit Solaris processes
1085341 32-bit stdio routines should support file descriptors >255
6369408 fflush(NULL); will corrupt data written on files in multithreaded apps
Diffstat (limited to 'usr/src/lib/libc/port/stdio/setvbuf.c')
| -rw-r--r-- | usr/src/lib/libc/port/stdio/setvbuf.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/usr/src/lib/libc/port/stdio/setvbuf.c b/usr/src/lib/libc/port/stdio/setvbuf.c index 7a7b3957e2..40a075637f 100644 --- a/usr/src/lib/libc/port/stdio/setvbuf.c +++ b/usr/src/lib/libc/port/stdio/setvbuf.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,16 +18,17 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" + #include "synonyms.h" #include "file64.h" @@ -48,6 +48,7 @@ setvbuf(FILE *iop, char *abuf, int type, size_t size) Uchar *temp; int sflag = iop->_flag & _IOMYBUF; rmutex_t *lk; + int fd = GET_FD(iop); FLOCKFILE(lk, iop); iop->_flag &= ~(_IOMYBUF | _IONBF | _IOLBF); @@ -56,14 +57,14 @@ setvbuf(FILE *iop, char *abuf, int type, size_t size) case _IONBF: iop->_flag |= _IONBF; /* file is unbuffered */ #ifndef _STDIO_ALLOCATE - if (iop->_file < 2) { + if (fd < 2) { /* use special buffer for std{in,out} */ - buf = (iop->_file == 0) ? _sibuf : _sobuf; + buf = (fd == 0) ? _sibuf : _sobuf; size = BUFSIZ; } else /* needed for ifdef */ #endif - if (iop->_file < _NFILE) { - buf = _smbuf[iop->_file]; + if (fd < _NFILE) { + buf = _smbuf[fd]; size = _SMBFSZ - PUSHBACK; } else if ((buf = malloc(_SMBFSZ * sizeof (Uchar))) != NULL) { |