зеркало из https://github.com/github/ruby.git
* 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/trunk@23989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
dddd406b0c
Коммит
ca93e00559
|
@ -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
|
||||
|
|
4
file.c
4
file.c
|
@ -3104,7 +3104,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;
|
||||
|
@ -3146,7 +3146,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);
|
||||
|
|
|
@ -392,8 +392,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", ".*"))
|
||||
|
|
Загрузка…
Ссылка в новой задаче