Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge revision(s) 27404:

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


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@28212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 72fad3bfe645ec271c01e7aea873c895deabb557 1 parent 74e43c4
@shyouhei shyouhei authored
View
5 ChangeLog
@@ -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
View
2  file.c
@@ -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
2  test/ruby/test_file_exhaustive.rb
@@ -403,6 +403,8 @@ def test_extname
end
end
end
+ bug3175 = '[ruby-core:29627]'
+ assert_equal(".rb", File.extname("/tmp//bla.rb"), bug3175)
end
def test_split
View
2  version.h
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.