diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 06:13:38 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 06:13:38 +0000 |
commit | cb3df565d754031841109cfc806610a13bc13f02 (patch) | |
tree | 04deb05526d4a2f836d0612d6f0192e31c25f024 | |
parent | bf674eca7c1e6563e559ab01839a65e7e5e5f8ca (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 4 | ||||
-rw-r--r-- | test/ruby/test_file_exhaustive.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jul 8 16:47:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_s_basename): returns new string instead of + shared string from FilePathStringValue(). [ruby-core:24199] + 2009-07-07 Eric Hodel <drbrain@segment7.net> * ext/.document: Update with extensions that appear to have @@ -3014,7 +3014,7 @@ rb_file_s_basename(int argc, VALUE *argv) } 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 @@ rb_file_s_basename(int argc, VALUE *argv) 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); diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 420b3d527e..0a4d6d39f4 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -385,8 +385,10 @@ class TestFileExhaustive < Test::Unit::TestCase 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", ".*")) @@ -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 |