nobu	2008-04-12 03:12:18 +0900 (Sat, 12 Apr 2008)

  New Revision: 15978

  Modified files:
    trunk/ChangeLog
    trunk/file.c
    trunk/version.h

  Log:
    * file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
      copy encoding.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15978&r2=15977&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/file.c?r1=15978&r2=15977&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15978&r2=15977&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15977)
+++ ChangeLog	(revision 15978)
@@ -1,3 +1,8 @@
+Sat Apr 12 03:12:16 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
+	  copy encoding.
+
 Fri Apr 11 17:35:06 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* enum.c (count_i): modified to shut warning up.
Index: version.h
===================================================================
--- version.h	(revision 15977)
+++ version.h	(revision 15978)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-04-11"
+#define RUBY_RELEASE_DATE "2008-04-12"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080411
+#define RUBY_RELEASE_CODE 20080412
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: file.c
===================================================================
--- file.c	(revision 15977)
+++ file.c	(revision 15978)
@@ -2880,6 +2880,7 @@
 	}
     }
     basename = rb_str_new(p, f);
+    rb_enc_copy(basename, fname);
     OBJ_INFECT(basename, fname);
     return basename;
 }
@@ -2931,6 +2932,7 @@
     if (has_drive_letter(name) && root == name + 2 && p - name == 2)
 	rb_str_cat(dirname, ".", 1);
 #endif
+    rb_enc_copy(dirname, fname);
     OBJ_INFECT(dirname, fname);
     return dirname;
 }
@@ -2967,6 +2969,7 @@
     if (!e || e == p || !e[1])	/* no dot, or the only dot is first or end? */
 	return rb_str_new(0, 0);
     extname = rb_str_new(e, chompdirsep(e) - e);	/* keep the dot, too! */
+    rb_enc_copy(extname, fname);
     OBJ_INFECT(extname, fname);
     return extname;
 }

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