shyouhei	2010-06-08 15:41:19 +0900 (Tue, 08 Jun 2010)

  New Revision: 28212

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28212

  Log:
    merge revision(s) 27404:
    * file.c (rb_file_s_extname): skip last directory separators.
      [ruby-core:29627]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/file.c
    branches/ruby_1_8_7/test/ruby/test_file_exhaustive.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28211)
+++ ruby_1_8_7/ChangeLog	(revision 28212)
@@ -1,3 +1,8 @@
+Tue Jun  8 15:34:15 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_s_extname): skip last directory separators.
+	  [ruby-core:29627]
+
 Tue Jun  8 15:33:30 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28211)
+++ ruby_1_8_7/version.h	(revision 28212)
@@ -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
Index: ruby_1_8_7/test/ruby/test_file_exhaustive.rb
===================================================================
--- ruby_1_8_7/test/ruby/test_file_exhaustive.rb	(revision 28211)
+++ ruby_1_8_7/test/ruby/test_file_exhaustive.rb	(revision 28212)
@@ -403,6 +403,8 @@
         end
       end
     end
+    bug3175 = '[ruby-core:29627]'
+    assert_equal(".rb", File.extname("/tmp//bla.rb"), bug3175)
   end
 
   def test_split
Index: ruby_1_8_7/file.c
===================================================================
--- ruby_1_8_7/file.c	(revision 28211)
+++ ruby_1_8_7/file.c	(revision 28212)
@@ -3024,7 +3024,7 @@
     if (!p)
 	p = name;
     else
-	name = ++p;
+	do name = ++p; while (isdirsep(*p));
 
     e = 0;
     while (*p) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/