libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* libc/stdio/refill.c (__srefill): Try again after EOF on Cygwin. Clear EOF 

flag if successful.
This commit is contained in:
Christopher Faylor 2004-11-17 17:02:10 +00:00
parent cd1ab47e38
commit 1f8f7e2d54
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2004-11-17 Christopher Faylor <cgf@timesys.com>
* libc/stdio/refill.c (__srefill): Try again after EOF on Cygwin. Clear
EOF flag if successful.
2004-10-28 Christopher Faylor <cgf@timesys.com> 2004-10-28 Christopher Faylor <cgf@timesys.com>
* libc/include/sys/signal.h: Move <signal.h> include to bottom of file * libc/include/sys/signal.h: Move <signal.h> include to bottom of file

8
newlib/libc/stdio/refill.c
View File

@ -45,9 +45,11 @@ _DEFUN(__srefill, (fp),
fp->_r = 0; /* largely a convenience for callers */ fp->_r = 0; /* largely a convenience for callers */
#ifndef __CYGWIN__
/* SysV does not make this test; take it out for compatibility */ /* SysV does not make this test; take it out for compatibility */
if (fp->_flags & __SEOF) if (fp->_flags & __SEOF)
return EOF; return EOF;
#endif
/* if not already reading, have to be reading and writing */ /* if not already reading, have to be reading and writing */
if ((fp->_flags & __SRD) == 0) if ((fp->_flags & __SRD) == 0)
@ -98,7 +100,13 @@ _DEFUN(__srefill, (fp),
fp->_p = fp->_bf._base; fp->_p = fp->_bf._base;
fp->_r = (*fp->_read) (fp->_cookie, (char *) fp->_p, fp->_bf._size); fp->_r = (*fp->_read) (fp->_cookie, (char *) fp->_p, fp->_bf._size);
fp->_flags &= ~__SMOD; /* buffer contents are again pristine */ fp->_flags &= ~__SMOD; /* buffer contents are again pristine */
#ifndef __CYGWIN__
if (fp->_r <= 0) if (fp->_r <= 0)
#else
if (fp->_r > 0)
fp->_flags &= ~__SEOF;
else
#endif
{ {
if (fp->_r == 0) if (fp->_r == 0)
fp->_flags |= __SEOF; fp->_flags |= __SEOF;