@@ -32,7 +32,7 @@ module.exports = function resolve(x, options, callback) {
3232
3333 opts . paths = opts . paths || [ ] ;
3434
35- if ( / ^ (?: \. \. ? (?: \/ | $ ) | \/ | ( [ A - Z a - z ] : ) ? [ \\ \/ ] ) / . test ( x ) ) {
35+ if ( / ^ (?: \. \. ? (?: \/ | $ ) | \/ | ( [ A - Z a - z ] : ) ? [ / \\ ] ) / . test ( x ) ) {
3636 var res = path . resolve ( y , x ) ;
3737 if ( x === '..' ) res += '/' ;
3838 if ( / \/ $ / . test ( x ) && res === y ) {
@@ -63,20 +63,22 @@ module.exports = function resolve(x, options, callback) {
6363 } ) ;
6464 }
6565
66- function loadAsFile ( x , pkg , callback ) {
66+ function loadAsFile ( x , thePackage , callback ) {
67+ var loadAsFilePackage = thePackage ;
6768 var cb = callback ;
68- if ( typeof pkg === 'function' ) {
69- cb = pkg ;
70- pkg = undefined ;
69+ if ( typeof loadAsFilePackage === 'function' ) {
70+ cb = loadAsFilePackage ;
71+ loadAsFilePackage = undefined ;
7172 }
7273
7374 var exts = [ '' ] . concat ( extensions ) ;
74- load ( exts , x , pkg ) ;
75+ load ( exts , x , loadAsFilePackage ) ;
7576
76- function load ( exts , x , pkg ) {
77- if ( exts . length === 0 ) return cb ( null , undefined , pkg ) ;
77+ function load ( exts , x , loadPackage ) {
78+ if ( exts . length === 0 ) return cb ( null , undefined , loadPackage ) ;
7879 var file = x + exts [ 0 ] ;
7980
81+ var pkg = loadPackage ;
8082 if ( pkg ) onpkg ( null , pkg ) ;
8183 else loadpkg ( path . dirname ( file ) , onpkg ) ;
8284
@@ -96,19 +98,19 @@ module.exports = function resolve(x, options, callback) {
9698 isFile ( file , onex ) ;
9799 }
98100 function onex ( err , ex ) {
99- if ( err ) cb ( err ) ;
100- else if ( ! ex ) load ( exts . slice ( 1 ) , x , pkg ) ;
101- else cb ( null , file , pkg ) ;
101+ if ( err ) return cb ( err ) ;
102+ if ( ex ) return cb ( null , file , pkg ) ;
103+ load ( exts . slice ( 1 ) , x , pkg ) ;
102104 }
103105 }
104106 }
105107
106108 function loadpkg ( dir , cb ) {
107109 if ( dir === '' || dir === '/' ) return cb ( null ) ;
108- if ( process . platform === 'win32' && ( / ^ \w : [ \\ \/ ] * $ / ) . test ( dir ) ) {
110+ if ( process . platform === 'win32' && ( / ^ \w : [ / \\ ] * $ / ) . test ( dir ) ) {
109111 return cb ( null ) ;
110112 }
111- if ( / [ \\ \/ ] n o d e _ m o d u l e s [ \\ \/ ] * $ / . test ( dir ) ) return cb ( null ) ;
113+ if ( / [ / \\ ] n o d e _ m o d u l e s [ / \\ ] * $ / . test ( dir ) ) return cb ( null ) ;
112114
113115 var pkgfile = path . join ( dir , 'package.json' ) ;
114116 isFile ( pkgfile , function ( err , ex ) {
@@ -127,8 +129,9 @@ module.exports = function resolve(x, options, callback) {
127129 } ) ;
128130 }
129131
130- function loadAsDirectory ( x , fpkg , callback ) {
132+ function loadAsDirectory ( x , loadAsDirectoryPackage , callback ) {
131133 var cb = callback ;
134+ var fpkg = loadAsDirectoryPackage ;
132135 if ( typeof fpkg === 'function' ) {
133136 cb = fpkg ;
134137 fpkg = opts . package ;
0 commit comments