1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX path.dirname('/tmp') => '/'.

Browse Source 
Previously path.dirname('/tmp') incorrectly returned '.'.

Unfortunately module.js incorrectly thinks dirname('/a/b/') should
yield '/a/b', so I can't strip trailing slashes yet. Once module.js
is fixed, then the commented-out code should be activated and a test
written for it.
This commit is contained in:
rentzsch 2010-05-16 14:29:29 -05:00 committed by Ryan Dahl
parent 022c083848
commit 36a45c4e0d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/path.js
View File

@ -38,7 +38,20 @@ exports.normalize = function (path, keepBlanks) {
};
exports.dirname = function (path) {
return path && path.substr(0, path.lastIndexOf("/")) || ".";
// Can't strip trailing slashes since module.js incorrectly thinks
// dirname('/a/b/') should yield '/a/b' instead of '/a'.
// if (path.length > 1 && '/' === path[path.length-1]) {
// path = path.replace(/\/+$/, '');
// }
var lastSlash = path.lastIndexOf('/');
switch (lastSlash) {
case -1:
return '.';
case 0:
return '/';
default:
return path.substring(0, lastSlash);
}
};
exports.filename = function () {

3
test/simple/test-path.js
View File

@ -7,6 +7,9 @@ assert.equal(path.basename(f), "test-path.js");
assert.equal(path.basename(f, ".js"), "test-path");
assert.equal(path.extname(f), ".js");
assert.equal(path.dirname(f).substr(-11), "test/simple");
assert.equal(path.dirname("/a/b"), "/a");
assert.equal(path.dirname("/a"), "/");
assert.equal(path.dirname("/"), "/");
path.exists(f, function (y) { assert.equal(y, true) });
assert.equal(path.join(".", "fixtures/b", "..", "/b/c.js"), "fixtures/b/c.js");