drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2004-12-13 Jeff Johnston <jjohnstn@redhat.com> 

* 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.
This commit is contained in:
Jeff Johnston 2004-12-13 19:42:16 +00:00
parent c6ad91f3f8
commit 82673116e1
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-13 Jeff Johnston <jjohnstn@redhat.com>
* 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.
2004-12-09 Alex Mogilnikov <alx@intellectronika.ru> 2004-12-09 Alex Mogilnikov <alx@intellectronika.ru>
* libc/time/tzset_r (_tzset_r): Properly skip over * libc/time/tzset_r (_tzset_r): Properly skip over

10
newlib/libc/stdio/fread.c
View File

@ -149,7 +149,7 @@ _DEFUN(fread, (buf, size, count, fp),
FREEUB (fp); FREEUB (fp);
/* Finally read directly into user's buffer if needed. */ /* Finally read directly into user's buffer if needed. */
if (resid > 0) while (resid > 0)
{ {
int rc = 0; int rc = 0;
/* save fp buffering state */ /* save fp buffering state */
@ -162,11 +162,14 @@ _DEFUN(fread, (buf, size, count, fp),
fp->_p = p; fp->_p = p;
rc = __srefill (fp); rc = __srefill (fp);
/* restore fp buffering back to original state */ /* restore fp buffering back to original state */
resid -= fp->_r;
fp->_r = 0;
fp->_bf._base = old_base; fp->_bf._base = old_base;
fp->_bf._size = old_size; fp->_bf._size = old_size;
fp->_p = old_p; fp->_p = old_p;
resid -= fp->_r;
p += fp->_r;
fp->_r = 0;
if (rc)
{
#ifdef __SCLE #ifdef __SCLE
if (fp->_flags & __SCLE) if (fp->_flags & __SCLE)
{ {
@ -178,6 +181,7 @@ _DEFUN(fread, (buf, size, count, fp),
return (total - resid) / size; return (total - resid) / size;
} }
} }
}
else else
#endif /* !PREFER_SIZE_OVER_SPEED && !__OPTIMIZE_SIZE__ */ #endif /* !PREFER_SIZE_OVER_SPEED && !__OPTIMIZE_SIZE__ */
{ {