From 884428daa69ac20d9035568e4fdf3a43fc7379b6 Mon Sep 17 00:00:00 2001
From: James <49045138+ghidracadabra@users.noreply.github.com>
Date: Wed, 22 May 2024 15:10:33 -0400
Subject: [PATCH] GP-4062 corrected path issues in bsim h2 script

---
 .../AddProgramToH2BSimDatabaseScript.java     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Ghidra/Features/BSim/ghidra_scripts/AddProgramToH2BSimDatabaseScript.java b/Ghidra/Features/BSim/ghidra_scripts/AddProgramToH2BSimDatabaseScript.java
index 91ca083fc4..648768ce7c 100644
--- a/Ghidra/Features/BSim/ghidra_scripts/AddProgramToH2BSimDatabaseScript.java
+++ b/Ghidra/Features/BSim/ghidra_scripts/AddProgramToH2BSimDatabaseScript.java
@@ -33,7 +33,7 @@ import ghidra.features.bsim.query.description.DescriptionManager;
 import ghidra.features.bsim.query.file.BSimH2FileDBConnectionManager;
 import ghidra.features.bsim.query.file.BSimH2FileDBConnectionManager.BSimH2FileDataSource;
 import ghidra.features.bsim.query.protocol.*;
-import ghidra.framework.model.DomainFolder;
+import ghidra.framework.model.DomainFile;
 import ghidra.framework.protocol.ghidra.GhidraURL;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.FunctionManager;
@@ -100,14 +100,23 @@ public class AddProgramToH2BSimDatabaseScript extends GhidraScript {
 				gensig.addFunctionTags(dbInfo.functionTags);
 				gensig.addDateColumnName(dbInfo.dateColumnName);
 
-				DomainFolder df = currentProgram.getDomainFile().getParent();
-				URL folderURL = df.getSharedProjectURL();
-				if (folderURL == null) {
-					folderURL = df.getLocalProjectURL();
+				DomainFile dFile = currentProgram.getDomainFile();
+				URL fileURL = dFile.getSharedProjectURL(null);
+				if (fileURL == null) {
+					fileURL = dFile.getLocalProjectURL(null);
+				}
+				if (fileURL == null) {
+					popup("Cannot add signatures for program which has never been saved");
+					return;
 				}
-				String path = GhidraURL.getProjectPathname(folderURL);
 
-				URL normalizedProjectURL = GhidraURL.getProjectURL(folderURL);
+				String path = GhidraURL.getProjectPathname(fileURL);
+				//bsim adds the program name to the path so we need to remove the program
+				//name here
+				int lastSlash = path.lastIndexOf('/');
+				path = lastSlash == 0 ? "/" : path.substring(0, lastSlash);
+
+				URL normalizedProjectURL = GhidraURL.getProjectURL(fileURL);
 				String repo = normalizedProjectURL.toExternalForm();
 
 				gensig.openProgram(this.currentProgram, null, null, null, repo, path);