Fix path.relative UNC path result

When the result of a path.relative() is an absolute UNC path, it should include the leading backslashes. Fixes: #8444
nodejs · Sep 13, 2016 · 5712f33 · 5712f33
1 parent 53178f9
commit 5712f33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/path.js b/lib/path.js
@@ -619,12 +619,8 @@ const win32 = {
 
     // We found a mismatch before the first common path separator was seen, so
     // return the original `to`.
-    // TODO: do this just for device roots (and not UNC paths)?
     if (i !== length && lastCommonSep === -1) {
-      if (toStart > 0)
-        return toOrig.slice(toStart);
-      else
-        return toOrig;
+      return toOrig;
     }
 
     var out = '';

diff --git a/test/parallel/test-path.js b/test/parallel/test-path.js
@@ -492,7 +492,9 @@ const relativeTests = [
      ['C:\\baz-quux', 'C:\\baz', '..\\baz'],
      ['C:\\baz', 'C:\\baz-quux', '..\\baz-quux'],
      ['\\\\foo\\baz-quux', '\\\\foo\\baz', '..\\baz'],
-     ['\\\\foo\\baz', '\\\\foo\\baz-quux', '..\\baz-quux']
+     ['\\\\foo\\baz', '\\\\foo\\baz-quux', '..\\baz-quux'],
+     ['C:\\baz', '\\\\foo\\bar\\baz', '\\\\foo\\bar\\baz'],
+     ['\\\\foo\\bar\\baz', 'C:\\baz', 'C:\\baz']
     ]
   ],
   [ path.posix.relative,