[C++] Fix wildcard_cache.mk

1 files changed, 4 insertions, 16 deletions

diff --git a/func.cc b/func.cc
index 6988b28..a33dd8e 100644
--- a/func.cc
+++ b/func.cc
@@ -17,7 +17,6 @@
 #include "func.h"
 
 #include <errno.h>
-#include <glob.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -257,25 +256,14 @@ void WildcardFunc(const vector<Value*>& args, Evaluator* ev, string* s) {
   }
 
   WordWriter ww(s);
-  vector<const char*> files;
+  vector<string>* files;
   for (StringPiece tok : WordScanner(*pat)) {
     ScopedTerminator st(tok);
-    // TODO: Make this faster by not always using glob.
-    files.clear();
-    glob_t gl;
-    glob(tok.data(), GLOB_NOSORT, NULL, &gl);
-    for (size_t i = 0; i < gl.gl_pathc; i++) {
-      files.push_back(gl.gl_pathv[i]);
-    }
-    sort(files.begin(), files.end(),
-         [](const char* a, const char* b) {
-           return strcmp(a, b) < 0;
-         });
-    for (const char* file : files) {
+    Glob(tok.data(), &files);
+    sort(files->begin(), files->end());
+    for (const string& file : *files) {
       ww.Write(file);
     }
-
-    globfree(&gl);
   }
 }