summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-08 07:47:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-08 07:47:09 +0000
commit299fd77f8ce50f0f59f012b7550a01e3d11d8024 (patch)
tree67eced22f186c986a9b61316404dfa549aee10ff /file.c
parenteabdd220ebdb6c0716eb1192277963665956c5ff (diff)
downloadruby-299fd77f8ce50f0f59f012b7550a01e3d11d8024.tar.gz
ruby-299fd77f8ce50f0f59f012b7550a01e3d11d8024.tar.xz
ruby-299fd77f8ce50f0f59f012b7550a01e3d11d8024.zip
* file.c (rb_file_s_basename): returns new string instead of
shared string from FilePathStringValue(). [ruby-core:24199] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 516737ddc..f9dfc620e 100644
--- a/file.c
+++ b/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);