From cd62a92d4a964bfe61d35ba2301b69e65e22a509 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Mon, 2 Mar 2020 05:43:45 +0000 Subject: 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 Reviewed by: John Levon Reviewed by: Yuri Pankov Approved by: Dan McDonald --- usr/src/lib/libc/port/stdio/ftello.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'usr/src/lib/libc/port/stdio/ftello.c') diff --git a/usr/src/lib/libc/port/stdio/ftello.c b/usr/src/lib/libc/port/stdio/ftello.c index 2eafdf1fef..cd43037ab1 100644 --- a/usr/src/lib/libc/port/stdio/ftello.c +++ b/usr/src/lib/libc/port/stdio/ftello.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* All Rights Reserved */ /* * Return file offset. @@ -60,30 +58,7 @@ off64_t ftello64(FILE *iop) { - ptrdiff_t adjust; - off64_t tres; - rmutex_t *lk; - - FLOCKFILE(lk, iop); - if (iop->_cnt < 0) - iop->_cnt = 0; - if (iop->_flag & _IOREAD) - adjust = (ptrdiff_t)-iop->_cnt; - else if (iop->_flag & (_IOWRT | _IORW)) { - adjust = 0; - if (((iop->_flag & (_IOWRT | _IONBF)) == _IOWRT) && - (iop->_base != 0)) - adjust = iop->_ptr - iop->_base; - } else { - errno = EBADF; /* file descriptor refers to no open file */ - FUNLOCKFILE(lk); - return ((off64_t)EOF); - } - tres = lseek64(FILENO(iop), 0, SEEK_CUR); - if (tres >= 0) - tres += (off64_t)adjust; - FUNLOCKFILE(lk); - return (tres); + return (ftell_common(iop)); } #endif /* _LP64 */ -- cgit v1.2.3