diff options
| author | raf <none@none> | 2008-01-23 12:00:31 -0800 |
|---|---|---|
| committer | raf <none@none> | 2008-01-23 12:00:31 -0800 |
| commit | a574db851cdc636fc3939b68e80d79fe7fbd57f2 (patch) | |
| tree | 7a28122042d1d24d9c4df92ba257e2d34d111e2e /usr/src/lib/libc/port/stdio/fputs.c | |
| parent | 4a7ceb24cfcc0a97f96d86cfe5852ae445b50e57 (diff) | |
| download | illumos-gate-a574db851cdc636fc3939b68e80d79fe7fbd57f2.tar.gz | |
6598890 cancellation code abuses synonyms
--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c
Diffstat (limited to 'usr/src/lib/libc/port/stdio/fputs.c')
| -rw-r--r-- | usr/src/lib/libc/port/stdio/fputs.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/lib/libc/port/stdio/fputs.c b/usr/src/lib/libc/port/stdio/fputs.c index 1ab3c57be5..e115d4012e 100644 --- a/usr/src/lib/libc/port/stdio/fputs.c +++ b/usr/src/lib/libc/port/stdio/fputs.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -121,13 +121,14 @@ fputs(const char *ptr, FILE *iop) int fd = GET_FD(iop); while ((num_wrote = write(fd, ptr, (size_t)count)) != count) { - if (num_wrote <= 0) { + if (num_wrote <= 0) { + if (!cancel_active()) iop->_flag |= _IOERR; - FUNLOCKFILE(lk); - return (EOF); - } - count -= num_wrote; - ptr += num_wrote; + FUNLOCKFILE(lk); + return (EOF); + } + count -= num_wrote; + ptr += num_wrote; } FUNLOCKFILE(lk); if (ptrlen <= INT_MAX) |