~ chicken-core (chicken-5) 6e6afed0e1cd2f57958c126e6192aed3f0f7c8bb

commit 6e6afed0e1cd2f57958c126e6192aed3f0f7c8bb
Author:     Peter Bex <peter.bex@xs4all.nl>
AuthorDate: Wed Oct 3 21:00:52 2012 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Oct 4 23:37:48 2012 +0200

    After calling getc() and getting back EOF, properly check feof() before checking errno; if errno is not cleared we'd get in an endless loop on an interrupted system call. These are quite rare, that's why this wasn't noticed before. Also copy the bit already read when looping, after receiving EINTR in read-line
    
    Signed-off-by: felix <felix@call-with-current-continuation.org>

diff --git a/library.scm b/library.scm
index faa2457e..8ea65ca6 100644
--- a/library.scm
+++ b/library.scm
@@ -76,15 +76,16 @@ fast_read_line_from_file(C_word str, C_word port, C_word size) {
   char *buf = C_c_string(str);
   C_FILEPTR fp = C_port_file(port);
 
-  if ((c = C_getc(fp)) == EOF)
-    return errno == EINTR ? C_fix(-1) : C_SCHEME_END_OF_FILE;
+  if ((c = C_getc(fp)) == EOF) {
+    return (errno == EINTR && !feof(fp)) ? C_fix(-1) : C_SCHEME_END_OF_FILE;
+  }
 
   C_ungetc(c, fp);
 
   for (i = 0; i < n; i++) {
     c = C_getc(fp);
 
-    if(c == EOF && errno == EINTR) {
+    if(c == EOF && errno == EINTR && !feof(fp)) {
       clearerr(fp);
       return C_fix(-(i + 1));
     }
@@ -110,7 +111,7 @@ fast_read_string_from_file(C_word dest, C_word port, C_word len, C_word pos)
 
   size_t m = fread (buf, sizeof (char), n, fp);
 
-  if(m == EOF && errno == EINTR) {
+  if(m == EOF && errno == EINTR && !feof(fp)) {
     clearerr(fp);
     return C_fix(-1);
   }
@@ -1810,7 +1811,10 @@ EOF
 			 (let ((n (fx- (fxneg n) 1)))
 			   (##sys#dispatch-interrupt
 			    (lambda ()
-			      (loop len limit buffer result f)))))
+			      (loop len limit buffer
+				    (##sys#string-append
+				     result (##sys#substring buffer 0 n))
+				    #t)))))
 			[f (##sys#setislot p 4 (fx+ (##sys#slot p 4) 1))
 			   (##sys#string-append result (##sys#substring buffer 0 n))]
 			[else
diff --git a/runtime.c b/runtime.c
index e4f56cfb..98f9706e 100644
--- a/runtime.c
+++ b/runtime.c
@@ -3957,7 +3957,7 @@ C_regparm C_word C_fcall C_read_char(C_word port)
   int c = C_getc(C_port_file(port));
 
   if(c == EOF) {
-    if(errno == EINTR) return C_fix(-1);
+    if(errno == EINTR && !feof(C_port_file(port))) return C_fix(-1);
     /* Found here:
        http://mail.python.org/pipermail/python-bugs-list/2002-July/012579.html */
 #if defined(_WIN32) && !defined(__CYGWIN__)
@@ -3976,7 +3976,7 @@ C_regparm C_word C_fcall C_peek_char(C_word port)
   int c = C_getc(fp);
 
   if(c == EOF) {
-    if(errno == EINTR) return C_fix(-1);
+    if(errno == EINTR && !feof(C_port_file(port))) return C_fix(-1);
     /* see above */
 #if defined(_WIN32) && !defined(__CYGWIN__)
     else if(GetLastError() == ERROR_OPERATION_ABORTED) return C_fix(-1);