path logic fix that seems to handle all the cases across this package and browserify

Author: James Halliday

lib/async.js

@@ -34,15 +34,10 @@ module.exports = function resolve (x, opts, cb) {
     if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[\\\/])/.test(x)) {
         var res = path.resolve(y, x);
         if (x === '..') res += '/';
-        loadAsFile(res, opts.package, function (err, m, pkg) {
-            if (err) cb(err)
-            else if (m) cb(null, m, pkg)
-            else loadAsDirectory(res, function (err, d, pkg) {
-                if (err) cb(err)
-                else if (d) cb(null, d, pkg)
-                else cb(new Error("Cannot find module '" + x + "' from '" + y + "'"))
-            })
-        });
+        if (/\/$/.test(x) && res === y) {
+            loadAsDirectory(res, opts.package, onfile);
+        }
+        else loadAsFile(res, opts.package, onfile);
     }
     else loadNodeModules(x, y, function (err, n, pkg) {
         if (err) cb(err)
@@ -51,21 +46,24 @@ module.exports = function resolve (x, opts, cb) {
         else cb(new Error("Cannot find module '" + x + "' from '" + y + "'"))
     });
 
-    function loadAsFile (x, pkg, cb, again) {
+    function onfile (err, m, pkg) {
+        if (err) cb(err)
+        else if (m) cb(null, m, pkg)
+        else loadAsDirectory(res, function (err, d, pkg) {
+            if (err) cb(err)
+            else if (d) cb(null, d, pkg)
+            else cb(new Error("Cannot find module '" + x + "' from '" + y + "'"))
+        })
+    }
+    
+    function loadAsFile (x, pkg, cb) {
         if (typeof pkg === 'function') {
             cb = pkg;
             pkg = undefined;
         }
 
         var exts = [''].concat(extensions);
-        
-        if (x === y && !again) {
-            loadAsDirectory(y, pkg, function (err, d, pkg) {
-                if (d) cb(err, d, pkg)
-                else loadAsFile(x, pkg, cb, true)
-            });
-        }
-        else load(exts, x, pkg)
+        load(exts, x, pkg)
 
 		function load (exts, x, pkg) {
             if (exts.length === 0) return cb(null, undefined, pkg);