Backport #1818 [ruby-core:24561]; (argf_eof): go to the next file if …

…called after ARGF.close or ARGF.skip. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@26451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Jan 27, 2010 · e341e9b · e341e9b
1 parent 74eb575
commit e341e9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 Wed Jan 27 22:16:00 2010 Kirk Haines <khaines@ruby-lang.org>
 
-	* lib/rexml/text.rb: Backport #1806 [ruby-core:24506]; (REXML::Text.normalize): call to_s for input.
+	* io.c: Backport #1818 [ruby-core:24561]; (argf_eof): go to the next file if called after ARGF.close or ARGF.skip. 
+
+	* lib/rexml/text.rb: Backport #1806 [ruby-core:24506]; (REXML::Text.normalize): call to_s for input. r26442
 
 Tue Jan 26 3:03:00 2010 Kirk Haines <khaines@ruby-lang.org>
 

diff --git a/io.c b/io.c
@@ -5430,6 +5430,7 @@ argf_eof()
 {
     if (current_file) {
 	if (init_p == 0) return Qtrue;
+        next_argv();
 	ARGF_FORWARD(0, 0);
 	if (rb_io_eof(current_file)) {
 	    return Qtrue;