Merge pull request #779 from bvernoux/patch-2

azonenberg · web-flow · commit f236404a40d1 · 2023-06-11T12:18:56.000-07:00
Update scopehal.cpp FindDataFile to use relative path when possible
diff --git a/scopehal/scopehal.cpp b/scopehal/scopehal.cpp
@@ -767,6 +767,12 @@ vector<uint32_t> ReadDataFileUint32(const string& relpath)
  */
 string FindDataFile(const string& relpath)
 {
+	FILE* fp = fopen(relpath.c_str(), "rb");
+	if(fp)
+	{
+		fclose(fp);
+		return relpath;
+	}
 	for(auto dir : g_searchPaths)
 	{
 		string path = dir + "/" + relpath;

Original file line number	Diff line number	Diff line change
`@@ -767,6 +767,12 @@ vector<uint32_t> ReadDataFileUint32(const string& relpath)`
`767`	`767`	`*/`
`768`	`768`	`string FindDataFile(const string& relpath)`
`769`	`769`	`{`
	`770`	`+ FILE* fp = fopen(relpath.c_str(), "rb");`
	`771`	`+ if(fp)`
	`772`	`+ {`
	`773`	`+ fclose(fp);`
	`774`	`+ return relpath;`
	`775`	`+ }`
`770`	`776`	`for(auto dir : g_searchPaths)`
`771`	`777`	`{`
`772`	`778`	`string path = dir + "/" + relpath;`