Fix potential windows compatibility issues with BinDiff

Author: emesare

plugins/bindiff_similarity/diffview.cpp

@@ -3,17 +3,16 @@
 #include "processor.h"
 
 #include <third_party/zynamics/bindiff/differ.h>
-#include <filesystem>
 
-std::unique_ptr<BinDiffView> BinDiffView::FromFilePath(const std::filesystem::path& filePath)
+std::unique_ptr<BinDiffView> BinDiffView::FromFilePath(const std::string& filePath)
 {
 	auto view = std::make_unique<BinDiffView>();
 	security::bindiff::Instruction::Cache instrCache;
 	auto status = security::bindiff::Read(
 		filePath, &view->m_callGraph, &view->m_flowGraphs, &view->m_flowGraphInfos, &instrCache);
 	if (!status.ok())
 	{
-		BinaryNinja::LogErrorF("Failed to read bindiff data from {}: {}", filePath.c_str(), status.message());
+		BinaryNinja::LogErrorF("Failed to read bindiff data from {}: {}", filePath, status.message());
 		return nullptr;
 	}
 	return view;

plugins/bindiff_similarity/diffview.h

@@ -8,6 +8,7 @@
 
 #include <third_party/zynamics/binexport/virtual_memory.h>
 #include <functional>
+#include <string>
 
 class BinDiffView
 {
@@ -20,7 +21,7 @@ class BinDiffView
 
 	BinDiffView() = default;
 
-	static std::unique_ptr<BinDiffView> FromFilePath(const std::filesystem::path& filePath);
+	static std::unique_ptr<BinDiffView> FromFilePath(const std::string& filePath);
 
 	// Generate a view from the given node, the nodes view must be available before calling.
 	static std::unique_ptr<BinDiffView> FromSessionNode(

plugins/bindiff_similarity/plugin.cpp

@@ -1,7 +1,5 @@
 #include <binaryninjaapi.h>
 
-#include <filesystem>
-
 #include "processor.h"
 #include "provider.h"
 
@@ -11,14 +9,21 @@ namespace {
 	void ExportBinExport(BinaryView* view)
 	{
 		const std::string inputFilename = view->GetFile()->GetFilename();
-		std::filesystem::path outputPath = inputFilename.empty() ? "export.BinExport" : inputFilename;
-		outputPath.replace_extension(".BinExport");
+		std::string outputPath = inputFilename.empty() ? "export.BinExport" : inputFilename;
+		if (!inputFilename.empty())
+		{
+			const size_t separator = outputPath.find_last_of("/\\");
+			const size_t filenameStart = separator == std::string::npos ? 0 : separator + 1;
+			const size_t extension = outputPath.find_last_of('.');
+			if ((extension != std::string::npos) && (extension > filenameStart))
+				outputPath.resize(extension);
+			outputPath += ".BinExport";
+		}
 
 		if (IsUIEnabled())
 		{
 			std::string selectedPath;
-			if (!GetSaveFileNameInput(
-					selectedPath, "Export BinExport", "BinExport files (*.BinExport)", outputPath.string()))
+			if (!GetSaveFileNameInput(selectedPath, "Export BinExport", "BinExport files (*.BinExport)", outputPath))
 				return;
 			outputPath = selectedPath;
 		}
@@ -33,7 +38,7 @@ namespace {
 			BinDiffProcessor processor(*view);
 			for (const auto& function : view->GetAnalysisFunctionList())
 				processor.AddFunction(*function);
-			success = processor.Process(outputPath.string());
+			success = processor.Process(outputPath);
 		}
 		if (!success && IsUIEnabled())
 		{