From 82673116e1d1da7c070f4f9b6a130364ae3c6bc5 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 13 Dec 2004 19:42:16 +0000 Subject: 2004-12-13 Jeff Johnston * libc/stdio/fread.c (fread): For unbuffered I/O, attempt a low-level read if we don't get the full amount of bytes so EOF or error flags will be set. --- newlib/libc/stdio/fread.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'newlib/libc/stdio/fread.c') diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index e0faa3578..a90c50bf4 100644 --- a/newlib/libc/stdio/fread.c +++ b/newlib/libc/stdio/fread.c @@ -149,7 +149,7 @@ _DEFUN(fread, (buf, size, count, fp), FREEUB (fp); /* Finally read directly into user's buffer if needed. */ - if (resid > 0) + while (resid > 0) { int rc = 0; /* save fp buffering state */ @@ -162,20 +162,24 @@ _DEFUN(fread, (buf, size, count, fp), fp->_p = p; rc = __srefill (fp); /* restore fp buffering back to original state */ - resid -= fp->_r; - fp->_r = 0; fp->_bf._base = old_base; fp->_bf._size = old_size; fp->_p = old_p; -#ifdef __SCLE - if (fp->_flags & __SCLE) + resid -= fp->_r; + p += fp->_r; + fp->_r = 0; + if (rc) { +#ifdef __SCLE + if (fp->_flags & __SCLE) + { + _funlockfile (fp); + return crlf (fp, buf, total-resid, 1) / size; + } +#endif _funlockfile (fp); - return crlf (fp, buf, total-resid, 1) / size; + return (total - resid) / size; } -#endif - _funlockfile (fp); - return (total - resid) / size; } } else -- cgit v1.2.3