summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc/port/stdio/getc.c
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@fingolfin.org>2020-03-02 05:43:27 +0000
committerRobert Mustacchi <rm@fingolfin.org>2020-03-26 07:42:53 +0000
commitd726994754c938f91b6fd7e96b5cab3829615c58 (patch)
tree93b4747937d685bceee3a122a77d2a1e63b8fa7d /usr/src/lib/libc/port/stdio/getc.c
parent8b11ca880a902725fb8b0bb2c639f3671ac806d6 (diff)
downloadillumos-joyent-d726994754c938f91b6fd7e96b5cab3829615c58.tar.gz
12357 getc/putc_unlocked need to set orientation
Reviewed by: John Levon <john.levon@joyent.com> Reviewed by: Yuri Pankov <ypankov@fastmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libc/port/stdio/getc.c')
-rw-r--r--usr/src/lib/libc/port/stdio/getc.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/lib/libc/port/stdio/getc.c b/usr/src/lib/libc/port/stdio/getc.c
index cfcf53f347..b7a48b7f3a 100644
--- a/usr/src/lib/libc/port/stdio/getc.c
+++ b/usr/src/lib/libc/port/stdio/getc.c
@@ -25,9 +25,7 @@
*/
/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
-#pragma ident "%Z%%M% %I% %E% SMI"
+/* All Rights Reserved */
#pragma weak _getc_unlocked = getc_unlocked
@@ -51,10 +49,7 @@ getc(FILE *iop)
int c;
FLOCKFILE(lk, iop);
-
- _SET_ORIENTATION_BYTE(iop);
-
- c = (--iop->_cnt < 0) ? __filbuf(iop) : *iop->_ptr++;
+ c = getc_unlocked(iop);
FUNLOCKFILE(lk);
return (c);
}
@@ -63,5 +58,12 @@ getc(FILE *iop)
int
getc_unlocked(FILE *iop)
{
+ _SET_ORIENTATION_BYTE(iop);
+ return ((--iop->_cnt < 0) ? __filbuf(iop) : *iop->_ptr++);
+}
+
+int
+_getc_internal(FILE *iop)
+{
return ((--iop->_cnt < 0) ? __filbuf(iop) : *iop->_ptr++);
}