gets rid of ^D^D to quit script from stdin.

merges r22017 from trunk into ruby_1_9_1.
* ruby.c (load_file_internal): resets EOF flag after parse.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 52c85b73c8..85797776e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb  3 23:37:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): resets EOF flag after parse.
+
 Tue Feb  3 14:12:10 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb: validate data before sending to a server.
diff --git a/ruby.c b/ruby.c
index 328912549b..cfefc04fa4 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1552,7 +1552,6 @@ load_file_internal(VALUE arg)
 	    rb_io_ungetbyte(f, c);
 	}
 	require_libraries(opt);	/* Why here? unnatural */
-	rb_io_ungetbyte(f, Qnil);
     }
     if (opt->src.enc.index >= 0) {
 	enc = rb_enc_from_index(opt->src.enc.index);
@@ -1572,6 +1571,9 @@ load_file_internal(VALUE arg)
     else if (f != rb_stdin) {
 	rb_io_close(f);
     }
+    else {
+	rb_io_ungetbyte(f, Qnil);
+    }
     return (VALUE)tree;
 }