daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

path: fix path.relative() for prefixes at root 

Fixes #5485

PR-URL: https://github.com/nodejs/node/pull/5490
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Brian White <mscdex@mscdex.net>
pull/5457/merge
Owen Smith 2016-02-29 10:39:19 -05:00 committed by Roman Reiss
parent 4d6b4c30dd
commit f296a7f16f
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/path.js
View File

@ -618,7 +618,7 @@ const win32 = {
// We get here if `from` is the exact base path for `to`. // We get here if `from` is the exact base path for `to`.
// For example: from='C:\\foo\\bar'; to='C:\\foo\\bar\\baz' // For example: from='C:\\foo\\bar'; to='C:\\foo\\bar\\baz'
return toOrig.slice(toStart + i + 1); return toOrig.slice(toStart + i + 1);
} else if (lastCommonSep === 2) { } else if (i === 2) {
// We get here if `from` is the device root. // We get here if `from` is the device root.
// For example: from='C:\\'; to='C:\\foo' // For example: from='C:\\'; to='C:\\foo'
return toOrig.slice(toStart + i); return toOrig.slice(toStart + i);
@ -629,7 +629,7 @@ const win32 = {
// We get here if `to` is the exact base path for `from`. // We get here if `to` is the exact base path for `from`.
// For example: from='C:\\foo\\bar'; to='C:\\foo' // For example: from='C:\\foo\\bar'; to='C:\\foo'
lastCommonSep = i; lastCommonSep = i;
} else if (lastCommonSep === 2) { } else if (i === 2) {
// We get here if `to` is the device root. // We get here if `to` is the device root.
// For example: from='C:\\foo\\bar'; to='C:\\' // For example: from='C:\\foo\\bar'; to='C:\\'
lastCommonSep = 3; lastCommonSep = 3;
@ -1300,16 +1300,26 @@ const posix = {
var i = 0; var i = 0;
for (; i <= length; ++i) { for (; i <= length; ++i) {
if (i === length) { if (i === length) {
if (lastCommonSep === -1) { if (toLen > length) {
lastCommonSep = i; if (to.charCodeAt(toStart + i) === 47/*/*/) {
} else if (toLen > length && to.charCodeAt(i + 1) === 47/*/*/) { // We get here if `from` is the exact base path for `to`.
// We get here if `from` is the exact base path for `to`. // For example: from='/foo/bar'; to='/foo/bar/baz'
// For example: from='/foo/bar'; to='/foo/bar/baz' return to.slice(toStart + i + 1);
return to.slice(i + 2); } else if (i === 0) {
} else if (fromLen > length && from.charCodeAt(i + 1) === 47/*/*/) { // We get here if `from` is the root
// We get here if `to` is the exact base path for `from`. // For example: from='/'; to='/foo'
// For example: from='/foo/bar/baz'; to='/foo/bar' return to.slice(toStart + i);
lastCommonSep = i; }
} else if (fromLen > length) {
if (from.charCodeAt(fromStart + i) === 47/*/*/) {
// We get here if `to` is the exact base path for `from`.
// For example: from='/foo/bar/baz'; to='/foo/bar'
lastCommonSep = i;
} else if (i === 0) {
// We get here if `to` is the root.
// For example: from='/foo'; to='/'
lastCommonSep = 0;
}
} }
break; break;
} }

10
test/parallel/test-path.js
View File

@ -476,7 +476,11 @@ const relativeTests = [
['\\\\foo\\bar', '\\\\foo\\bar\\baz', 'baz'], ['\\\\foo\\bar', '\\\\foo\\bar\\baz', 'baz'],
['\\\\foo\\bar\\baz', '\\\\foo\\bar', '..'], ['\\\\foo\\bar\\baz', '\\\\foo\\bar', '..'],
['\\\\foo\\bar\\baz-quux', '\\\\foo\\bar\\baz', '..\\baz'], ['\\\\foo\\bar\\baz-quux', '\\\\foo\\bar\\baz', '..\\baz'],
['\\\\foo\\bar\\baz', '\\\\foo\\bar\\baz-quux', '..\\baz-quux'] ['\\\\foo\\bar\\baz', '\\\\foo\\bar\\baz-quux', '..\\baz-quux'],
['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']
] ]
], ],
[ path.posix.relative, [ path.posix.relative,
@ -490,7 +494,9 @@ const relativeTests = [
['/foo/test', '/foo/test/bar/package.json', 'bar/package.json'], ['/foo/test', '/foo/test/bar/package.json', 'bar/package.json'],
['/Users/a/web/b/test/mails', '/Users/a/web/b', '../..'], ['/Users/a/web/b/test/mails', '/Users/a/web/b', '../..'],
['/foo/bar/baz-quux', '/foo/bar/baz', '../baz'], ['/foo/bar/baz-quux', '/foo/bar/baz', '../baz'],
['/foo/bar/baz', '/foo/bar/baz-quux', '../baz-quux'] ['/foo/bar/baz', '/foo/bar/baz-quux', '../baz-quux'],
['/baz-quux', '/baz', '../baz'],
['/baz', '/baz-quux', '../baz-quux']
] ]
] ]
]; ];