merges r21709, r21710 from trunk into ruby_1_9_1.

* include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
* io.c (io_set_eof): sets EOF flag for TTY.
* io.c (io_seek): clears EOF flag.
* io.c (io_fillbuf): returns EOF if already met EOF.  [ruby-dev:37798]
* io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 28 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 730e8b9c4..86a0832b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jan 21 13:58:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
+
+	* io.c (io_set_eof): sets EOF flag for TTY.
+
+	* io.c (io_seek): clears EOF flag.
+
+	* io.c (io_fillbuf): returns EOF if already met EOF.  [ruby-dev:37798]
+
+	* io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.
+
 Wed Jan 21 14:41:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* array.c (take_items): to_ary() raises ArgumentError if cannot to
diff --git a/include/ruby/io.h b/include/ruby/io.h
index 04af3d07e..64773549f 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -92,6 +92,7 @@ typedef struct rb_io_t {
 #define FMODE_WSPLIT_INITIALIZED    0x00000400
 #define FMODE_TRUNC                 0x00000800
 #define FMODE_TEXTMODE              0x00001000
+#define FMODE_EOF                   0x00002000
 /* #define FMODE_PREP               0x00010000 */
 
 #define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
diff --git a/io.c b/io.c
index 553a55b2c..d9abd6328 100644
--- a/io.c
+++ b/io.c
@@ -353,7 +353,8 @@ flush_before_seek(rb_io_t *fptr)
     return fptr;
 }
 
-#define io_seek(fptr, ofs, whence) lseek(flush_before_seek(fptr)->fd, ofs, whence)
+#define io_set_eof(fptr) (void)(((fptr)->mode & FMODE_TTY) && ((fptr)->mode |= FMODE_EOF))
+#define io_seek(fptr, ofs, whence) (fptr->mode &= ~FMODE_EOF, lseek(flush_before_seek(fptr)->fd, ofs, whence))
 #define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
 
 #ifndef SEEK_CUR
@@ -1147,6 +1148,9 @@ io_fillbuf(rb_io_t *fptr)
 {
     int r;
 
+    if (fptr->mode & FMODE_EOF) {
+	return -1;
+    }
     if (fptr->rbuf == NULL) {
         fptr->rbuf_off = 0;
         fptr->rbuf_len = 0;
@@ -1165,8 +1169,10 @@ io_fillbuf(rb_io_t *fptr)
         }
         fptr->rbuf_off = 0;
         fptr->rbuf_len = r;
-        if (r == 0)
+        if (r == 0) {
+	    io_set_eof(fptr);
             return -1; /* EOF */
+	}
     }
     return 0;
 }
@@ -1422,7 +1428,10 @@ io_fread(VALUE str, long offset, rb_io_t *fptr)
     if (READ_DATA_PENDING(fptr) == 0) {
 	while (n > 0) {
 	    c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n);
-	    if (c == 0) break;
+	    if (c == 0) {
+		io_set_eof(fptr);
+		break;
+	    }
 	    if (c < 0) {
 		rb_sys_fail_path(fptr->pathv);
 	    }
@@ -1729,6 +1738,9 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
                 goto again;
             rb_sys_fail_path(fptr->pathv);
         }
+	else if (n == 0) {
+	    io_set_eof(fptr);
+	}
     }
     rb_str_resize(str, n);