mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
Merge remote-tracking branch 'origin/GP-7169_ryanmkurtz_headless--SQUASHED'
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user