calcrom bugfix: use nftw() instead of glob() to recursively search both the asm/ and src/ directory trees for .s/.c/.cpp files

1 files changed, 32 insertions, 3 deletions

diff --git a/.travis/calcrom/calcrom.cpp b/.travis/calcrom/calcrom.cpp
index fd0ac79..9b429b2 100644
--- a/.travis/calcrom/calcrom.cpp
+++ b/.travis/calcrom/calcrom.cpp
@@ -31,6 +31,7 @@
 #include <regex>
 #include <elf.h>
 #include <glob.h>
+#include <ftw.h>
 #include <string.h>
 #include <vector>
 #include <string>
@@ -54,6 +55,21 @@ public:
     }
 };
 
+static vector<string> files;
+
+static int
+get_files(const char *fpath, const struct stat *sb,
+            int tflag, struct FTW *ftwbuf)
+{
+    if (tflag == FTW_F) {
+        string fpath_s(fpath);
+        string ext = fpath_s.substr(fpath_s.rfind('.'), 4);
+        if (ext == ".c" || ext == ".cpp" || ".s")
+            files.push_back(fpath_s);
+    }
+    return 0;
+}
+
 static inline Elf32_Half ElfHalfEndianAdjust(Elf32_Half val)
 {
     return (Elf32_Half)__builtin_bswap16((uint16_t)val);
@@ -115,10 +131,23 @@ void analyze(string basedir, string version) {
     builddir << "/build/" << version;
     stringstream basebuilddir;
     basebuilddir << basedir << builddir.str();
-    pattern << basedir << "/{src,asm}/*.{c,s,cpp}";
-    for (char const * & fname : Glob(pattern.str()))
+    pattern << basedir << "/{src,asm}/**/*.{c,s,cpp}";
+    
+    // Recursively search the src/ and asm/ directories for
+    // .c, .cpp, and .s files, accumulating them all into files
+    string srcdir = basedir + "/src";
+    string asmdir = basedir + "/asm";
+    if (nftw(srcdir.c_str(), get_files, 20, 0) == -1) {
+        perror("nftw");
+        exit(EXIT_FAILURE);
+    }
+    if (nftw(asmdir.c_str(), get_files, 20, 0) == -1) {
+        perror("nftw");
+        exit(EXIT_FAILURE);
+    }
+
+    for (auto fname_s : files)
     {
-        string fname_s(fname);
         string ext = fname_s.substr(fname_s.rfind('.'), 4);
         bool is_asm = ext == ".s";
         string fileroot = fname_s.substr(fname_s.rfind('/') + 1);