glob@3.1.19

1 files changed, 23 insertions, 6 deletions

diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js
index 0b73526d3..d241e7c4f 100644
--- a/node_modules/glob/glob.js
+++ b/node_modules/glob/glob.js
@@ -324,7 +324,13 @@ Glob.prototype._process = function (pattern, depth, index, cb_) {
         // nothing more to do, either way.
         if (exists) {
           if (prefix && isAbsolute(prefix) && !this.nomount) {
-            prefix = path.join(this.root, prefix)
+	    if (prefix.charAt(0) === "/") {
+	      console.error('JOIN 0', this.root, prefix)
+              prefix = path.join(this.root, prefix)
+	      console.error('JOIN 1', this.root, prefix)
+	    } else {
+	      prefix = path.resolve(this.root, prefix)
+	    }
           }
 
           if (process.platform === "win32")
@@ -357,15 +363,20 @@ Glob.prototype._process = function (pattern, depth, index, cb_) {
   var read
   if (prefix === null) read = "."
   else if (isAbsolute(prefix) || isAbsolute(pattern.join("/"))) {
-    if (!prefix || !isAbsolute(prefix))
+    if (!prefix || !isAbsolute(prefix)) {
+	    console.error('JOIN 1', "/", prefix)
       prefix = path.join("/", prefix)
+	    console.error('JOIN 2', "/", prefix)
+    }
     read = prefix = path.resolve(prefix)
 
-    if (process.platform === "win32")
-      read = prefix = prefix.replace(/^[a-zA-Z]:|\\/g, "/")
+    // if (process.platform === "win32")
+    //   read = prefix = prefix.replace(/^[a-zA-Z]:|\\/g, "/")
 
-    this.log('absolute: ', prefix, this.root, pattern)
-  } else read = prefix
+    this.log('absolute: ', prefix, this.root, pattern, read)
+  } else {
+    read = prefix
+  }
 
   this.log('readdir(%j)', read, this.cwd, this.root)
 
@@ -433,7 +444,9 @@ Glob.prototype._process = function (pattern, depth, index, cb_) {
           else e = prefix + e
         }
         if (e.charAt(0) === "/" && !this.nomount) {
+	    console.error('JOIN 3', this.root, e)
           e = path.join(this.root, e)
+	    console.error('JOIN 4', this.root, e)
         }
 
         if (process.platform === "win32")
@@ -468,7 +481,9 @@ Glob.prototype._stat = function (f, cb) {
   assert(this instanceof Glob)
   var abs = f
   if (f.charAt(0) === "/") {
+	    console.error('JOIN 5', this.root, f)
     abs = path.join(this.root, f)
+	    console.error('JOIN 6', this.root, f)
   } else if (this.changedCwd) {
     abs = path.resolve(this.cwd, f)
   }
@@ -526,7 +541,9 @@ Glob.prototype._readdir = function (f, cb) {
   assert(this instanceof Glob)
   var abs = f
   if (f.charAt(0) === "/") {
+	    console.error('JOIN 5', this.root, f)
     abs = path.join(this.root, f)
+	    console.error('JOIN 5', abs)
   } else if (isAbsolute(f)) {
     abs = f
   } else if (this.changedCwd) {