src: normalize for Windows's sake

dead-horse · Sep 23, 2014 · e9498e3 · e9498e3
1 parent b622c83
commit e9498e3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/fs.js b/lib/fs.js
@@ -1313,6 +1313,7 @@ fs.realpathSync = function realpathSync(p, cache) {
     start();
   }
 
+  p = pathModule.normalize(p);
   if (cache) cache[original] = p;
 
   return p;
@@ -1372,6 +1373,7 @@ fs.realpath = function realpath(p, cache, cb) {
   function LOOP() {
     // stop if scanned past end of path
     if (pos >= p.length) {
+      p = pathModule.normalize(p);
       if (cache) cache[original] = p;
       return cb(null, p);
     }

diff --git a/lib/module.js b/lib/module.js
@@ -405,7 +405,7 @@ Module.prototype._compile = function(content, filename) {
 
   require.cache = Module._cache;
 
-  var dirname = path.dirname(filename);
+  var dirname = path.normalize(path.dirname(filename));
 
   if (Module._contextLoad) {
     if (self.id !== '.') {

diff --git a/src/node.cc b/src/node.cc
@@ -1612,10 +1612,15 @@ static void Cwd(const FunctionCallbackInfo<Value>& args) {
     return env->ThrowUVException(err, "uv_cwd");
   }
 
+#ifdef _WIN32
+  buf[0] = tolower(buf[0]);
+#endif
+
   Local<String> cwd = String::NewFromUtf8(env->isolate(),
                                           buf,
                                           String::kNormalString,
                                           cwd_len - 1);
+
   args.GetReturnValue().Set(cwd);
 }