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/doscan.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/doscan.c')
| -rw-r--r-- | usr/src/lib/libc/port/stdio/doscan.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/lib/libc/port/stdio/doscan.c b/usr/src/lib/libc/port/stdio/doscan.c index e375d9824f..fda4d5c2ea 100644 --- a/usr/src/lib/libc/port/stdio/doscan.c +++ b/usr/src/lib/libc/port/stdio/doscan.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* All Rights Reserved */ #include "lint.h" #include <sys/types.h> @@ -402,7 +400,7 @@ charswitch: /* target of a goto 8-( */ if (size == 'l') { int c, len, i; int negflg = 0; - unsigned char *p; + unsigned char *p; p = (unsigned char *)(fmt - 1); len = 0; @@ -830,10 +828,10 @@ readchar(FILE *iop, int *chcount) int inchar; char buf[1]; - if ((iop->_flag & _IOWRT) || (iop->_cnt != 0)) + if ((iop->_flag & _IOWRT) || (iop->_cnt != 0)) { inchar = locgetc((*chcount)); - else { - if (read(FILENO(iop), buf, 1) != 1) + } else { + if (_xread(iop, buf, 1) != 1) return (EOF); inchar = (int)buf[0]; (*chcount) += 1; |