Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit dc1293b

Browse files
author
不四
committed
path: resolve normalize drive letter to lower case
make path.resolve work the same as path.normalize
1 parent 21e6064 commit dc1293b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

lib/path.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ if (isWindows) {
163163
resolvedTail = normalizeArray(resolvedTail.split(/[\\\/]+/).filter(f),
164164
!resolvedAbsolute).join('\\');
165165

166+
// If device is a drive letter, we'll normalize to lower case.
167+
if (resolvedDevice && resolvedDevice.charAt(1) === ':')
168+
resolvedDevice = resolvedDevice[0].toLowerCase() +
169+
resolvedDevice.substr(1);
170+
166171
return (resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail) ||
167172
'.';
168173
};

test/simple/test-path.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,15 @@ if (isWindows) {
315315
// path.resolve tests
316316
if (isWindows) {
317317
// windows
318+
var cwd = process.cwd();
319+
cwd = cwd[0].toLowerCase() + cwd.substr(1);
318320
var resolveTests =
319321
// arguments result
320322
[[['c:/blah\\blah', 'd:/games', 'c:../a'], 'c:\\blah\\a'],
321323
[['c:/ignore', 'd:\\a/b\\c/d', '\\e.exe'], 'd:\\e.exe'],
322324
[['c:/ignore', 'c:/some/file'], 'c:\\some\\file'],
323325
[['d:/ignore', 'd:some/dir//'], 'd:\\ignore\\some\\dir'],
324-
[['.'], process.cwd()],
326+
[['.'], cwd],
325327
[['//server/share', '..', 'relative\\'], '\\\\server\\share\\relative'],
326328
[['c:/', '//'], 'c:\\'],
327329
[['c:/', '//dir'], 'c:\\dir'],

0 commit comments

Comments
 (0)