1 files changed, 37 insertions, 15 deletions
diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py
index b0ca73b997..df629110c2 100644
--- a/scripts/maint/practracker/util.py
+++ b/scripts/maint/practracker/util.py
@@ -2,27 +2,49 @@ import os
 
 # We don't want to run metrics for unittests, automatically-generated C files,
 # external libraries or git leftovers.
-EXCLUDE_SOURCE_DIRS = {"/src/test/", "/src/trunnel/", "/src/ext/", "/.git/"}
+EXCLUDE_SOURCE_DIRS = {"src/test/", "src/trunnel/", "src/rust/",
+                       "src/ext/" }
 
-def get_tor_c_files(tor_topdir):
+EXCLUDE_FILES = {"orconfig.h"}
+
+def _norm(p):
+    return os.path.normcase(os.path.normpath(p))
+
+def get_tor_c_files(tor_topdir, include_dirs=None):
     """
-    Return a list with the .c filenames we want to get metrics of.
+    Return a list with the .c and .h filenames we want to get metrics of.
     """
     files_list = []
+    exclude_dirs = { _norm(os.path.join(tor_topdir, p)) for p in EXCLUDE_SOURCE_DIRS }
 
-    for root, directories, filenames in os.walk(tor_topdir):
-        directories.sort()
-        filenames.sort()
-        for filename in filenames:
-            # We only care about .c files
-            if not filename.endswith(".c"):
-                continue
+    if include_dirs is None:
+        topdirs = [ tor_topdir ]
+    else:
+        topdirs = [ os.path.join(tor_topdir, inc) for inc in include_dirs ]
 
-            # Exclude the excluded paths
-            full_path = os.path.join(root,filename)
-            if any(os.path.normcase(exclude_dir) in full_path for exclude_dir in EXCLUDE_SOURCE_DIRS):
-                continue
+    for topdir in topdirs:
+        for root, directories, filenames in os.walk(topdir):
+            # Remove all the directories that are excluded.
+            directories[:] = [ d for d in directories
+                               if _norm(os.path.join(root,d)) not in exclude_dirs ]
+            directories.sort()
+            filenames.sort()
+            for filename in filenames:
+                # We only care about .c and .h files
+                if not (filename.endswith(".c") or filename.endswith(".h")):
+                    continue
+                if filename in EXCLUDE_FILES:
+                    continue
 
-            files_list.append(full_path)
+                full_path = os.path.join(root,filename)
+
+                files_list.append(full_path)
 
     return files_list
+
+class NullFile:
+    """A file-like object that we can us to suppress output."""
+    def __init__(self):
+        pass
+    def write(self, s):
+        pass