summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-18 09:09:25 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-18 09:09:25 +0000
commit1f8db9021e3882fc795abe89806fa5a3bfb17b8b (patch)
tree8fb6fddc6a0947a336c37801652688a34f5ba2d6 /file.c
parent1fe022b590ff24c83cf77aba7586b511be6f768b (diff)
downloadruby-1f8db9021e3882fc795abe89806fa5a3bfb17b8b.tar.gz
ruby-1f8db9021e3882fc795abe89806fa5a3bfb17b8b.tar.xz
ruby-1f8db9021e3882fc795abe89806fa5a3bfb17b8b.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@9563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 669929b60..e427cedad 100644
--- a/file.c
+++ b/file.c
@@ -2626,8 +2626,8 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
name = StringValueCStr(fname);
root = skiproot(name);
#ifdef DOSISH_UNC
- if (root > name + 2 && isdirsep(*name))
- name = root - 2;
+ if (root > name + 1 && isdirsep(*name))
+ root = skipprefix(name = root - 2);
#else
if (root > name + 1)
name = root - 1;