1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 27404:

* file.c (rb_file_s_extname): skip last directory separators.
	  [ruby-core:29627]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-06-08 06:41:19 +00:00
parent 9252cb7d33
commit e3947edd23
4 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Tue Jun 8 15:34:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_extname): skip last directory separators.
[ruby-core:29627]
Tue Jun 8 15:33:30 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are

2
file.c
View file

@ -3024,7 +3024,7 @@ rb_file_s_extname(klass, fname)
if (!p)
p = name;
else
name = ++p;
do name = ++p; while (isdirsep(*p));
e = 0;
while (*p) {

View file

@ -403,6 +403,8 @@ class TestFileExhaustive < Test::Unit::TestCase
end
end
end
bug3175 = '[ruby-core:29627]'
assert_equal(".rb", File.extname("/tmp//bla.rb"), bug3175)
end
def test_split

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-06-08"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100608
#define RUBY_PATCHLEVEL 276
#define RUBY_PATCHLEVEL 277
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8