From f2c25bb3e4eb6c0fe738ecda954fbd740d99fc5a Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Nov 2005 05:48:51 +0000
Subject: * file.c (rb_file_s_basename): skip slashes just after UNC top
 slashes.

* test/ruby/test_path.rb (test_dirname, test_basename): follow new
  spec. and add new tests.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 file.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 3c725e457..25d516606 100644
--- a/file.c
+++ b/file.c
@@ -2278,7 +2278,9 @@ rb_path_skip_prefix(path)
 #if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
 #ifdef DOSISH_UNC
     if (isdirsep(path[0]) && isdirsep(path[1])) {
-	if (*(path = nextdirsep(path + 2)) && path[1] && !isdirsep(path[1]))
+	path += 2;
+	while (isdirsep(*path)) path++;
+	if (*(path = nextdirsep(path)) && path[1] && !isdirsep(path[1]))
 	    path = nextdirsep(path + 1);
 	return (char *)path;
     }
-- 
cgit