shyouhei	2009-07-29 11:44:29 +0900 (Wed, 29 Jul 2009)

  New Revision: 24312

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24312

  Log:
    merge revision(s) 23700:
    * io.c (argf_close): always call #close method.  [ruby-core:23853]
    * io.c (argf_skip): should close only when current_file is available.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/io.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24311)
+++ ruby_1_8_7/ChangeLog	(revision 24312)
@@ -1,3 +1,9 @@
+Wed Jul 29 11:19:47 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* io.c (argf_close): always call #close method.  [ruby-core:23853]
+
+	* io.c (argf_skip): should close only when current_file is available.
+
 Sat Jul 25 21:26:18 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* enum.c (first_i): Enumerator#first should consume only what is
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24311)
+++ ruby_1_8_7/version.h	(revision 24312)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-25"
+#define RUBY_RELEASE_DATE "2009-07-29"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090725
-#define RUBY_PATCHLEVEL 190
+#define RUBY_RELEASE_CODE 20090729
+#define RUBY_PATCHLEVEL 191
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/io.c
===================================================================
--- ruby_1_8_7/io.c	(revision 24311)
+++ ruby_1_8_7/io.c	(revision 24312)
@@ -4484,10 +4484,7 @@
 argf_close(file)
     VALUE file;
 {
-    if (TYPE(file) == T_FILE)
-	rb_io_close(file);
-    else
-	rb_funcall3(file, rb_intern("close"), 0, 0);
+    rb_funcall3(file, rb_intern("close"), 0, 0);
 }
 
 static int
@@ -5735,7 +5732,7 @@
 static VALUE
 argf_skip()
 {
-    if (next_p != -1) {
+    if (init_p && next_p == 0) {
 	argf_close(current_file);
 	next_p = 1;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/