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 | 46bafdd84d6236d80645d87e000e0ab18bf497c7 (patch) | |
| tree | 103854f07e72e6283add8f565ef61eff0ea36287 | |
| parent | e23e534ae5d38b552e0c8f63e79c0e341c7439ce (diff) | |
* 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@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 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Apr 20 00:43:03 2010 Nobuyoshi Nakada <[email protected]> + + * file.c (rb_file_s_extname): skip last directory separators. + [ruby-core:29627] + Mon Apr 19 19:42:08 2010 URABE Shyouhei <[email protected]> * lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are @@ -3015,7 +3015,7 @@ rb_file_s_extname(klass, 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 7824b6e85f..5c34c915f8 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 @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-04-19" +#define RUBY_RELEASE_DATE "2010-04-20" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100419 +#define RUBY_RELEASE_CODE 20100420 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |