Ghidra is a software reverse engineering (SRE) framework
GP-7169: Headless fix
Ryan Kurtz7a969f941bc4
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.javaindex a7269cd967..dd1079f761 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java@@ -1697,6 +1697,10 @@ public class HeadlessAnalyzer {folderPath += DomainFolder.SEPARATOR;}folderPath += startDir.getName();++ // Handles windows directory paths like "d:", both real and extracted paths on non-windows+ // filesystem or archive files+ folderPath = folderPath.replaceAll(":/", "/");for (GFile file : fs.getListing(startDir)) {String name = file.getName();@@ -1713,7 +1717,9 @@ public class HeadlessAnalyzer {continue;}try {- checkValidFilename(fqFSRL.getName());+ if (!file.isDirectory()) {+ checkValidFilename(fqFSRL.getName());+ }processWithImport(fqFSRL, folderPath, depth, false);}catch (InvalidInputException e) {diff --git a/Ghidra/RuntimeScripts/support/analyzeHeadlessREADME.md b/Ghidra/RuntimeScripts/support/analyzeHeadlessREADME.mdindex ecb4f92ef1..d51b0fa17f 100644--- a/Ghidra/RuntimeScripts/support/analyzeHeadlessREADME.md+++ b/Ghidra/RuntimeScripts/support/analyzeHeadlessREADME.md@@ -66,7 +66,7 @@ for common use cases.[<a href="#-scriptlog-path-to-script-log-file">-scriptlog <path to script log file></a>][<a href="#-log-path-to-log-file">-log <path to log file></a>][<a href="#-overwrite">-overwrite</a>]- [<a href="#-mirror">-overwrite</a>]+ [<a href="#-mirror">-mirror</a>][<a href="#-recursive-depth">-recursive [<depth>]</a>][<a href="#-readonly">-readOnly</a>][<a href="#-deleteproject">-deleteProject</a>]