* file.c (rb_file_s_dirname): should use skipprefix for UNC path.

  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 6 deletions

diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb
index 4b9365508a..09ab4ac677 100644
--- a/test/ruby/test_path.rb
+++ b/test/ruby/test_path.rb
@@ -95,23 +95,31 @@ class TestPath < Test::Unit::TestCase
     if /(bcc|ms|cyg)win|mingw|djgpp|human|emx/ =~ RUBY_PLATFORM
       # DOSISH_UNC
       assert_equal('//', File.dirname('//'))
-      assert_equal('//', File.dirname('//a'))
-      assert_equal('//', File.dirname('//a/'))
-      assert_equal('//a', File.dirname('//a/b'))
+      assert_equal('//a', File.dirname('//a'))
+      assert_equal('//a/', File.dirname('//a/'))
+      assert_equal('//a/b', File.dirname('//a/b'))
+      assert_equal('//a/b', File.dirname('//a/b/'))
+      assert_equal('//a/b', File.dirname('//a/b/c'))
       assert_equal('//', File.dirname('///'))
-      assert_equal('//', File.dirname('///a'))
-      assert_equal('//', File.dirname('///a/'))
-      assert_equal('//a', File.dirname('///a/b'))
+      assert_equal('//a', File.dirname('///a'))
+      assert_equal('//a/', File.dirname('///a/'))
+      assert_equal('//a/b', File.dirname('///a/b'))
+      assert_equal('//a/b', File.dirname('///a/b/'))
+      assert_equal('//a/b', File.dirname('///a/b/c'))
     else
       # others
       assert_equal('/', File.dirname('//'))
       assert_equal('/', File.dirname('//a'))
       assert_equal('/', File.dirname('//a/'))
       assert_equal('/a', File.dirname('//a/b'))
+      assert_equal('/a', File.dirname('//a/b/'))
+      assert_equal('/a/b', File.dirname('//a/b/c'))
       assert_equal('/', File.dirname('///'))
       assert_equal('/', File.dirname('///a'))
       assert_equal('/', File.dirname('///a/'))
       assert_equal('/a', File.dirname('///a/b'))
+      assert_equal('/a', File.dirname('///a/b/'))
+      assert_equal('/a/b', File.dirname('///a/b/c'))
     end
   end
 end