diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 06:41:19 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 06:41:19 +0000 |
commit | e3947edd23a33c294d6a41a50af8ac098aa82da9 (patch) | |
tree | 9b820bafc2e58c68c2ddefb179cbe3e621dfb13d | |
parent | 9252cb7d33682802f44fbe3a3a45356182557a1b (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | test/ruby/test_file_exhaustive.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -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 @@ -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) { diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index ca3227d832..eb4c77fc54 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -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 @@ -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 |