diff --git a/lib/path.js b/lib/path.js index 980348e7d11..0b24de299fc 100644 --- a/lib/path.js +++ b/lib/path.js @@ -290,17 +290,7 @@ if (isWindows) { // 'root' is just a slash, or nothing. var splitPathRe = /^(\/?)([\s\S]+\/(?!$)|\/)?((?:\.{1,2}$|[\s\S]+?)?(\.[^.\/]*)?)$/; - var trailingSlash = /\/+$/; var splitPath = function(filename) { - - // removes trailing slashes before spliting the path - var tail = trailingSlash.exec(filename); - if (tail) { - if (tail.index === 0) return ['/', '', '', '']; - - filename = filename.slice(0, tail.index); - } - var result = splitPathRe.exec(filename); return [result[1] || '', result[2] || '', result[3] || '', result[4] || '']; }; diff --git a/test/simple/test-path.js b/test/simple/test-path.js index e2ded95621e..1c03887e14a 100644 --- a/test/simple/test-path.js +++ b/test/simple/test-path.js @@ -30,11 +30,6 @@ var f = __filename; assert.equal(path.basename(f), 'test-path.js'); assert.equal(path.basename(f, '.js'), 'test-path'); -assert.equal(path.basename('/dir/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('basename.ext//'), 'basename.ext'); // POSIX filenames may include control characters // c.f. http://www.dwheeler.com/essays/fixing-unix-linux-filenames.html @@ -52,7 +47,6 @@ assert.equal(path.dirname('/a/b/'), '/a'); assert.equal(path.dirname('/a/b'), '/a'); assert.equal(path.dirname('/a'), '/'); assert.equal(path.dirname('/'), '/'); -assert.equal(path.dirname('////'), '/'); if (isWindows) { assert.equal(path.dirname('c:\\'), 'c:\\'); @@ -120,8 +114,7 @@ assert.equal(path.extname('..file..'), '.'); assert.equal(path.extname('...'), '.'); assert.equal(path.extname('...ext'), '.ext'); assert.equal(path.extname('....'), '.'); -assert.equal(path.extname('file.ext/'), '.ext'); -assert.equal(path.extname('file.ext//'), '.ext'); +assert.equal(path.extname('file.ext/'), ''); if (isWindows) { // On windows, backspace is a path separator.