Permalink
Browse files

path: fix normalize for absolutes

Fixes a regression introduced by
b212be0.

path.normalize(''/a/b/c/../../../x/y/z'') should return '/x/y/z'.

Fixes: #5585
PR-URL: #5589
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
  • Loading branch information...
evanlucas authored and Fishrock123 committed Mar 7, 2016
1 parent 7be726f commit f3971f58178d82565fb66c69e6e0b5a2aeb21c9b
Showing with 5 additions and 2 deletions.
  1. +2 −2 lib/path.js
  2. +3 −0 test/parallel/test-path.js
View
@@ -44,7 +44,7 @@ function normalizeStringWin32(path, allowAboveRoot) {
dots = 0;
continue;
}
} else if (res.length === 2) {
} else if (res.length === 2 || res.length === 1) {
res = '';
lastSlash = i;
dots = 0;
@@ -110,7 +110,7 @@ function normalizeStringPosix(path, allowAboveRoot) {
dots = 0;
continue;
}
} else if (res.length === 2) {
} else if (res.length === 2 || res.length === 1) {
res = '';
lastSlash = i;
dots = 0;
@@ -377,13 +377,16 @@ assert.equal(path.win32.normalize('a//b//./c'), 'a\\b\\c');
assert.equal(path.win32.normalize('a//b//.'), 'a\\b');
assert.equal(path.win32.normalize('//server/share/dir/file.ext'),
'\\\\server\\share\\dir\\file.ext');
assert.equal(path.win32.normalize('/a/b/c/../../../x/y/z'), '\\x\\y\\z');
assert.equal(path.posix.normalize('./fixtures///b/../b/c.js'),
'fixtures/b/c.js');
assert.equal(path.posix.normalize('/foo/../../../bar'), '/bar');
assert.equal(path.posix.normalize('a//b//../b'), 'a/b');
assert.equal(path.posix.normalize('a//b//./c'), 'a/b/c');
assert.equal(path.posix.normalize('a//b//.'), 'a/b');
assert.equal(path.posix.normalize('/a/b/c/../../../x/y/z'), '/x/y/z');
assert.equal(path.posix.normalize('///..//./foo/.//bar'), '/foo/bar');
// path.resolve tests

0 comments on commit f3971f5

Please sign in to comment.