nobu	2008-08-06 05:10:16 +0900 (Wed, 06 Aug 2008)

  New Revision: 18378

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

  Log:
    * file.c (rb_find_file): reset to real class.
    
    * io.c (io_reopen): ditto.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/file.c
    branches/ruby_1_8/io.c
    branches/ruby_1_8/version.h

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18377)
+++ ruby_1_8/ChangeLog	(revision 18378)
@@ -1,3 +1,9 @@
+Wed Aug  6 05:10:14 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_find_file): reset to real class.
+
+	* io.c (io_reopen): ditto.
+
 Tue Aug  5 16:43:07 2008  Shugo Maeda  <shugo@r...>
 
 	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 18377)
+++ ruby_1_8/version.h	(revision 18378)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-08-05"
+#define RUBY_RELEASE_DATE "2008-08-06"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080805
+#define RUBY_RELEASE_CODE 20080806
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/io.c
===================================================================
--- ruby_1_8/io.c	(revision 18377)
+++ ruby_1_8/io.c	(revision 18378)
@@ -3724,7 +3724,7 @@
 	rb_io_binmode(io);
     }
 
-    RBASIC(io)->klass = RBASIC(nfile)->klass;
+    RBASIC(io)->klass = rb_obj_class(nfile);
     return io;
 }
 
Index: ruby_1_8/file.c
===================================================================
--- ruby_1_8/file.c	(revision 18377)
+++ ruby_1_8/file.c	(revision 18378)
@@ -4432,6 +4432,7 @@
 	for (j=0; ext[j]; j++) {
 	    rb_str_cat2(tmp, ext[j]);
 	    if (file_load_ok(RSTRING_PTR(tmp))) {
+		rb_str_resize(tmp, 0);
 		fname = rb_str_dup(*filep);
 		rb_str_cat2(fname, ext[j]);
 		OBJ_FREEZE(fname);
@@ -4500,7 +4501,7 @@
 	}
 	return 0;
       found:
-	RBASIC(tmp)->klass = RBASIC(path)->klass;
+	RBASIC(tmp)->klass = rb_obj_class(path);
 	OBJ_FREEZE(tmp);
     }
     else {

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