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:
parent
9252cb7d33
commit
e3947edd23
4 changed files with 9 additions and 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>
|
Tue Jun 8 15:33:30 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
|
||||||
|
|
||||||
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
|
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
|
||||||
|
|
2
file.c
2
file.c
|
@ -3024,7 +3024,7 @@ rb_file_s_extname(klass, fname)
|
||||||
if (!p)
|
if (!p)
|
||||||
p = name;
|
p = name;
|
||||||
else
|
else
|
||||||
name = ++p;
|
do name = ++p; while (isdirsep(*p));
|
||||||
|
|
||||||
e = 0;
|
e = 0;
|
||||||
while (*p) {
|
while (*p) {
|
||||||
|
|
|
@ -403,6 +403,8 @@ class TestFileExhaustive < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
bug3175 = '[ruby-core:29627]'
|
||||||
|
assert_equal(".rb", File.extname("/tmp//bla.rb"), bug3175)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_split
|
def test_split
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define RUBY_RELEASE_DATE "2010-06-08"
|
#define RUBY_RELEASE_DATE "2010-06-08"
|
||||||
#define RUBY_VERSION_CODE 187
|
#define RUBY_VERSION_CODE 187
|
||||||
#define RUBY_RELEASE_CODE 20100608
|
#define RUBY_RELEASE_CODE 20100608
|
||||||
#define RUBY_PATCHLEVEL 276
|
#define RUBY_PATCHLEVEL 277
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
#define RUBY_VERSION_MINOR 8
|
#define RUBY_VERSION_MINOR 8
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue