public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Ken Brown <kbrown@sourceware.org> To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: stdio: don't try again to read after EOF Date: Mon, 4 Jul 2022 23:05:08 +0000 (GMT) [thread overview] Message-ID: <20220704230508.8125E3858D1E@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1503d14af1472824322d8fa8a012173b3f27a733 commit 1503d14af1472824322d8fa8a012173b3f27a733 Author: Ken Brown <kbrown@cornell.edu> Date: Mon Jul 4 18:32:10 2022 -0400 Cygwin: stdio: don't try again to read after EOF This reverts commit 1f8f7e2d54, "* libc/stdio/refill.c (__srefill): Try again after EOF on Cygwin." If EOF is set on a file, the stdio input functions will now immediately return EOF rather than trying again to read. This aligns Cygwin's behavior to that of Linux. Addresses: https://cygwin.com/pipermail/cygwin/2022-June/251672.html Diff: --- newlib/libc/stdio/refill.c | 8 -------- winsup/cygwin/release/3.4.0 | 4 ++++ winsup/doc/new-features.xml | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c index 8516d8576..91e79e832 100644 --- a/newlib/libc/stdio/refill.c +++ b/newlib/libc/stdio/refill.c @@ -47,11 +47,9 @@ __srefill_r (struct _reent * ptr, fp->_r = 0; /* largely a convenience for callers */ -#ifndef __CYGWIN__ /* SysV does not make this test; take it out for compatibility */ if (fp->_flags & __SEOF) return EOF; -#endif /* if not already reading, have to be reading and writing */ if ((fp->_flags & __SRD) == 0) @@ -115,13 +113,7 @@ __srefill_r (struct _reent * ptr, fp->_p = fp->_bf._base; fp->_r = fp->_read (ptr, fp->_cookie, (char *) fp->_p, fp->_bf._size); -#ifndef __CYGWIN__ if (fp->_r <= 0) -#else - if (fp->_r > 0) - fp->_flags &= ~__SEOF; - else -#endif { if (fp->_r == 0) fp->_flags |= __SEOF; diff --git a/winsup/cygwin/release/3.4.0 b/winsup/cygwin/release/3.4.0 index a12905a46..ff600deca 100644 --- a/winsup/cygwin/release/3.4.0 +++ b/winsup/cygwin/release/3.4.0 @@ -17,6 +17,10 @@ What changed: opened in byte mode rather than message mode. Addresses: https://cygwin.com/pipermail/cygwin/2021-March/247987.html +- The stdio input functions no longer try again to read after EOF. + This aligns Cygwin behavior to that of Linux. + Addresses: https://cygwin.com/pipermail/cygwin/2022-June/251672.html + Bug Fixes --------- diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml index c696a972a..0149a027a 100644 --- a/winsup/doc/new-features.xml +++ b/winsup/doc/new-features.xml @@ -29,6 +29,10 @@ opened in byte mode rather than message mode. Handle UDP_SEGMENT and UDP_GRO socket options. </para></listitem> +<listitem><para> +The stdio input functions no longer try again to read after EOF. +</para></listitem> + </itemizedlist> </sect2>
reply other threads:[~2022-07-04 23:05 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220704230508.8125E3858D1E@sourceware.org \ --to=kbrown@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).