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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index 050cbd2d6..9c9da582e 100644
--- a/file.c
+++ b/file.c
@@ -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);