diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-03-27 11:29:00 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-03-27 11:29:00 +0000 |
commit | 6dcfbbc68f881fbf5c20d25817a0221dfb135170 (patch) | |
tree | 40307666f6d7711499061d8c4be75029a6d851e9 /usr/src/lib/libc/port/stdio/getw.c | |
parent | b0624b90ec9a0c04cca626925beee3ae403457ce (diff) | |
parent | cd62a92d4a964bfe61d35ba2301b69e65e22a509 (diff) | |
download | illumos-joyent-6dcfbbc68f881fbf5c20d25817a0221dfb135170.tar.gz |
[illumos-gate merge]
commit cd62a92d4a964bfe61d35ba2301b69e65e22a509
7092 Want support for stdio memory streams
12360 fwrite can loop forever on zero byte write
12392 ftello64 doesn't handle ungetc() correctly when unbuffered
commit 1470234269f4edea4cbf270cb2475e4988b788d5
12359 Want a means to set the umem mtbf at runtine
commit 0ac311bae7f6f50d9ba506b52bd8860f2d68d4ce
12358 Need mbrtowc variant that indicates consumed zero bytes
commit d726994754c938f91b6fd7e96b5cab3829615c58
12357 getc/putc_unlocked need to set orientation
Diffstat (limited to 'usr/src/lib/libc/port/stdio/getw.c')
-rw-r--r-- | usr/src/lib/libc/port/stdio/getw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/lib/libc/port/stdio/getw.c b/usr/src/lib/libc/port/stdio/getw.c index cca7732a00..9c81e8cea9 100644 --- a/usr/src/lib/libc/port/stdio/getw.c +++ b/usr/src/lib/libc/port/stdio/getw.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* All Rights Reserved */ /* * The intent here is to provide a means to make the order of @@ -57,7 +55,7 @@ getw(FILE *stream) FLOCKFILE(lk, stream); while (--i >= 0 && !(stream->_flag & (_IOERR | _IOEOF))) - *s++ = GETC(stream); + *s++ = getc_unlocked(stream); ret = ((stream->_flag & (_IOERR | _IOEOF)) ? EOF : w); FUNLOCKFILE(lk); return (ret); |