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.


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

3 files changed, 12 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 59ff55ffa8..9bd52b1eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 29 11:19:47 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* enum.c (first_i): Enumerator#first should consume only what is
diff --git a/io.c b/io.c
index 8b0e51b460..3799c1b622 100644
--- a/io.c
+++ b/io.c
@@ -4484,10 +4484,7 @@ static void
 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 @@ argf_binmode()
 static VALUE
 argf_skip()
 {
-    if (next_p != -1) {
+    if (init_p && next_p == 0) {
 	argf_close(current_file);
 	next_p = 1;
     }
diff --git a/version.h b/version.h
index 4700b53a3e..7274bfdc3e 100644
--- a/version.h
+++ b/version.h
@@ -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[];