Correct slash behavior for dirs passed as pattern

glob.js

@@ -569,10 +569,13 @@ Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
     return cb()
 
   if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
     if (prefix.charAt(0) === "/") {
       prefix = path.join(this.root, prefix)
     } else {
       prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
     }
   }
 

sync.js

@@ -337,10 +337,13 @@ GlobSync.prototype._processSimple = function (prefix, index) {
     return
 
   if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
     if (prefix.charAt(0) === "/") {
       prefix = path.join(this.root, prefix)
     } else {
       prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
     }
   }
 

test/mark-sync.js

@@ -84,3 +84,20 @@ test("mark=false, / on pattern", function (t) {
   t.same(results, expect)
   t.end()
 })
+
+var cwd = process.cwd().replace(/[\/\\]+$/, '').replace(/\\/g, '/')
+;[true,false].forEach(function (mark) {
+  ;[true,false].forEach(function (slash) {
+    test("cwd mark:" + mark + " slash:" + slash, function (t) {
+      var pattern = cwd + (slash ? '/' : '')
+      var results = glob.sync(pattern, {mark:mark})
+      t.equal(results.length, 1)
+      var res = results[0].replace(/\\/g, '/')
+      if (slash || mark)
+        t.equal(res, cwd + '/')
+      else
+        t.equal(res.indexOf(cwd), 0)
+      t.end()
+    })
+  })
+})

test/mark.js

@@ -117,3 +117,21 @@ test("mark=false, / on pattern", function (t) {
     t.similar(m, /\/$/)
   })
 })
+
+var cwd = process.cwd().replace(/[\/\\]+$/, '').replace(/\\/g, '/')
+;[true,false].forEach(function (mark) {
+  ;[true,false].forEach(function (slash) {
+    test("cwd mark:" + mark + " slash:" + slash, function (t) {
+      var pattern = cwd + (slash ? '/' : '')
+      glob(pattern, {mark:mark}, function (er, results) {
+        t.equal(results.length, 1)
+        var res = results[0].replace(/\\/g, '/')
+        if (slash || mark)
+          t.equal(res, cwd + '/')
+        else
+          t.equal(res.indexOf(cwd), 0)
+        t.end()
+      })
+    })
+  })
+})