diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-19 15:43:05 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-19 15:43:05 +0000 |
commit | cb508fe7397a6054a45cac11cf3e865f13f24aea (patch) | |
tree | e404a68163a9aef008f978be71eda26ca949e20c | |
parent | a91d8b8c33b834f47ab000cc3844e9b18c1becba (diff) | |
download | ruby-cb508fe7397a6054a45cac11cf3e865f13f24aea.tar.gz |
* file.c (rb_file_s_extname): skip last directory separators.
[ruby-core:29627]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27404 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 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Apr 20 00:43:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_s_extname): skip last directory separators. + [ruby-core:29627] + Tue Apr 20 00:41:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (internal_{read,write}_func, rb_{read,write}_internal): @@ -3500,7 +3500,7 @@ rb_file_s_extname(VALUE klass, VALUE fname) if (!p) p = name; else - name = ++p; + do name = ++p; while (isdirsep(*p)); e = 0; while (*p && *p == '.') p++; diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 4a26e435b8..634197e0a7 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -454,6 +454,8 @@ class TestFileExhaustive < Test::Unit::TestCase end end end + bug3175 = '[ruby-core:29627]' + assert_equal(".rb", File.extname("/tmp//bla.rb"), bug3175) assert_incompatible_encoding {|d| File.extname(d)} end |