Fixed patterns in mtdir when introduced a subfolder

src/main.d

@@ -380,8 +380,6 @@ ubyte[] hashFile(Digest digest, string path)
 // NOTE: file can be a stream!
 ubyte[] hashFile(Digest digest, ref File file)
 {
-    version (Trace) trace("path=%s", path);
-
     try
     {
         digest.reset();
@@ -541,8 +539,6 @@ int processList(string path, bool autodetect, Style style)
             // Parse entry hash to byte array
             ubyte[] hashExpected = unformatHex(entryHash);
 
-            version (Trace) trace("result=%s expected=%s", result, expected);
-
             // Compare binary hashes.
             // secureEqual is used in case this is used server-side.
             if (secureEqual(hashResult, hashExpected) == false)
@@ -852,8 +848,9 @@ void main(string[] args)
             {
                 try
                 {
-                    scope pattern = baseName(entry); // Extract pattern
                     scope folder  = dirName(entry);  // Results to "." by default
+                    scope pattern = baseName(entry); // Extract pattern
+                    version (Trace) trace("folder=%s pattern=%s", folder, pattern);
                     dirEntriesMT(folder, pattern, options.span, !onofollow,
                         &initThreadDigest, &mtDirEntry, othreads);
                 }

src/mtdir.d

@@ -7,7 +7,7 @@ module mtdir;
 
 import std.concurrency;
 import std.file;
-import std.path : globMatch;
+import std.path : globMatch, baseName;
 import std.parallelism : totalCPUs;
 
 //TODO: Find a way to construct dirEntries iterator.
@@ -65,7 +65,7 @@ void dirEntriesSTImpl(string path, string pattern, SpanMode mode, bool follow,
     immutable(void)* uobj = fnspawn();
     foreach (DirEntry entry; dirEntries(path, mode, follow))
     {
-        if (pattern && globMatch(entry.name, pattern) == false)
+        if (pattern && globMatch(baseName(entry.name), pattern) == false)
             continue;
         fnentry(entry, uobj);
     }
@@ -95,7 +95,7 @@ void dirEntriesMTImpl(string path, string pattern, SpanMode mode, bool followLin
     int cur; // Current thread index
     foreach (DirEntry entry; dirEntries(path, mode, followLinks))
     {
-        if (pattern && globMatch(entry.name, pattern) == false)
+        if (pattern && globMatch(baseName(entry.name), pattern) == false)
             continue;
         send(pool[cur], MsgEntry(entry));
         if (++cur >= threads) cur = 0;