diff options
author | Brian White <mscdex@mscdex.net> | 2016-05-05 08:27:06 +0300 |
---|---|---|
committer | Brian White <mscdex@mscdex.net> | 2016-05-18 09:12:28 +0300 |
commit | dfaa9c905530e30bd02d713c37546febb7446257 (patch) | |
tree | 2ec54a442fad4075035c5f5c82fccb6ee88ca7be | |
parent | 2ccba1f9fa8e593d09f2f4f284e246e1f8bb6549 (diff) |
path: fix basename() regressions
This commit fixes a regression in basename() for the case when a
supplied extension name completely matches the resulting basename.
Fixes: https://github.com/nodejs/node/issues/6587
PR-URL: https://github.com/nodejs/node/pull/6590
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
-rw-r--r-- | lib/path.js | 12 | ||||
-rw-r--r-- | test/parallel/test-path.js | 17 |
2 files changed, 20 insertions, 9 deletions
diff --git a/lib/path.js b/lib/path.js index 0fbc715ea8c..5637b328c1d 100644 --- a/lib/path.js +++ b/lib/path.js @@ -855,8 +855,10 @@ const win32 = { } } - if (end === -1) - return ''; + if (start === end) + end = firstNonSlashEnd; + else if (end === -1) + end = path.length; return path.slice(start, end); } else { for (i = path.length - 1; i >= start; --i) { @@ -1398,8 +1400,10 @@ const posix = { } } - if (end === -1) - return ''; + if (start === end) + end = firstNonSlashEnd; + else if (end === -1) + end = path.length; return path.slice(start, end); } else { for (i = path.length - 1; i >= 0; --i) { diff --git a/test/parallel/test-path.js b/test/parallel/test-path.js index b758b059a2d..8b31046e66f 100644 --- a/test/parallel/test-path.js +++ b/test/parallel/test-path.js @@ -15,6 +15,12 @@ assert.equal(path.basename('/basename.ext'), 'basename.ext'); assert.equal(path.basename('basename.ext'), 'basename.ext'); assert.equal(path.basename('basename.ext/'), 'basename.ext'); assert.equal(path.basename('basename.ext//'), 'basename.ext'); +assert.equal(path.basename('aaa/bbb', '/bbb'), 'bbb'); +assert.equal(path.basename('aaa/bbb', 'a/bbb'), 'bbb'); +assert.equal(path.basename('aaa/bbb', 'bbb'), 'bbb'); +assert.equal(path.basename('aaa/bbb//', 'bbb'), 'bbb'); +assert.equal(path.basename('aaa/bbb', 'bb'), 'b'); +assert.equal(path.basename('aaa/bbb', 'b'), 'bb'); // On Windows a backslash acts as a path separator. assert.equal(path.win32.basename('\\dir\\basename.ext'), 'basename.ext'); @@ -23,11 +29,12 @@ assert.equal(path.win32.basename('basename.ext'), 'basename.ext'); assert.equal(path.win32.basename('basename.ext\\'), 'basename.ext'); assert.equal(path.win32.basename('basename.ext\\\\'), 'basename.ext'); assert.equal(path.win32.basename('foo'), 'foo'); -assert.throws(path.win32.basename.bind(null, null), TypeError); -assert.throws(path.win32.basename.bind(null, true), TypeError); -assert.throws(path.win32.basename.bind(null, 1), TypeError); -assert.throws(path.win32.basename.bind(null), TypeError); -assert.throws(path.win32.basename.bind(null, {}), TypeError); +assert.equal(path.win32.basename('aaa\\bbb', '\\bbb'), 'bbb'); +assert.equal(path.win32.basename('aaa\\bbb', 'a\\bbb'), 'bbb'); +assert.equal(path.win32.basename('aaa\\bbb', 'bbb'), 'bbb'); +assert.equal(path.win32.basename('aaa\\bbb\\\\\\\\', 'bbb'), 'bbb'); +assert.equal(path.win32.basename('aaa\\bbb', 'bb'), 'b'); +assert.equal(path.win32.basename('aaa\\bbb', 'b'), 'bb'); // On unix a backslash is just treated as any other character. assert.equal(path.posix.basename('\\dir\\basename.ext'), '\\dir\\basename.ext'); |