yugui	2009-07-13 15:13:38 +0900 (Mon, 13 Jul 2009)

  New Revision: 24073

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

  Log:
    merges r23989 from trunk into ruby_1_9_1.
    --
    * file.c (rb_file_s_basename): returns new string instead of
      shared string from FilePathStringValue().  [ruby-core:24199]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/file.c
    branches/ruby_1_9_1/test/ruby/test_file_exhaustive.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24072)
+++ ruby_1_9_1/ChangeLog	(revision 24073)
@@ -1,3 +1,8 @@
+Wed Jul  8 16:47:03 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_s_basename): returns new string instead of
+	  shared string from FilePathStringValue().  [ruby-core:24199]
+
 2009-07-07  Eric Hodel  <drbrain@s...>
 
 	* ext/.document:  Update with extensions that appear to have
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24072)
+++ ruby_1_9_1/version.h	(revision 24073)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-07-12"
-#define RUBY_PATCHLEVEL 223
+#define RUBY_PATCHLEVEL 224
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/test/ruby/test_file_exhaustive.rb
===================================================================
--- ruby_1_9_1/test/ruby/test_file_exhaustive.rb	(revision 24072)
+++ ruby_1_9_1/test/ruby/test_file_exhaustive.rb	(revision 24073)
@@ -385,8 +385,10 @@
 
   def test_basename
     assert_equal(File.basename(@file).sub(/\.test$/, ""), File.basename(@file, ".test"))
-    assert_equal("", File.basename(""))
-    assert_equal("foo", File.basename("foo"))
+    assert_equal("", s = File.basename(""))
+    assert(!s.frozen?, '[ruby-core:24199]')
+    assert_equal("foo", s = File.basename("foo"))
+    assert(!s.frozen?, '[ruby-core:24199]')
     assert_equal("foo", File.basename("foo", ".ext"))
     assert_equal("foo", File.basename("foo.ext", ".ext"))
     assert_equal("foo", File.basename("foo.ext", ".*"))
Index: ruby_1_9_1/file.c
===================================================================
--- ruby_1_9_1/file.c	(revision 24072)
+++ ruby_1_9_1/file.c	(revision 24073)
@@ -3014,7 +3014,7 @@
     }
     FilePathStringValue(fname);
     if (RSTRING_LEN(fname) == 0 || !*(name = RSTRING_PTR(fname)))
-	return fname;
+	return rb_str_new_shared(fname);
     name = skipprefix(name);
 #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
     root = name;
@@ -3056,7 +3056,7 @@
 	if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) {
 	    f = n;
 	}
-	if (f == RSTRING_LEN(fname)) return fname;
+	if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname);
     }
     basename = rb_str_new(p, f);
     rb_enc_copy(basename, fname);

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