fix issues with spaces in path to binaries (#339)

notimaginative · web-flow · commit 42d069b8a7f6 · 2025-10-25T00:04:13.000-04:00
diff --git a/Knossos.NET/Classes/FsoBuild.cs b/Knossos.NET/Classes/FsoBuild.cs
@@ -266,11 +266,11 @@ public async Task<FsoResult> RunFSO(FsoExecType executableType, string cmdline,
                             fso.StartInfo.FileName = prefixCMD[0];
                             if (prefixCMD.Length > 1)
                             {
-                                fso.StartInfo.Arguments = prefixCMD[1] + " " + execPath + " " + cmdline;
+                                fso.StartInfo.Arguments = $"{prefixCMD[1]} \"{execPath}\" {cmdline}";
                             }
                             else
                             {
-                                fso.StartInfo.Arguments = execPath + " " + cmdline;
+                                fso.StartInfo.Arguments = $"\"{execPath}\" {cmdline}";
                             }
                         }
 
diff --git a/Knossos.NET/Classes/Wine.cs b/Knossos.NET/Classes/Wine.cs
@@ -53,7 +53,7 @@ public static async Task<WineResult> RunTool(string exePath, string exeCmdLine,
                 using (var wine = new Process())
                 {
                     wine.StartInfo.FileName = "wine";
-                    wine.StartInfo.Arguments = exePath + " " + exeCmdLine;
+                    wine.StartInfo.Arguments = $"\"{exePath}\" {exeCmdLine}";
                     if (workingFolder != null)
                     {
                         wine.StartInfo.WorkingDirectory = workingFolder;
@@ -102,7 +102,7 @@ public static async Task<WineResult> RunFred2(string exePath, string exeCmdLine,
                 using (var wine = new Process())
                 {
                     wine.StartInfo.FileName = "wine";
-                    wine.StartInfo.Arguments = exePath + " " + exeCmdLine;
+                    wine.StartInfo.Arguments = $"\"{exePath}\" {exeCmdLine}";
                     if (workingFolder != null)
                     {
                         wine.StartInfo.WorkingDirectory = workingFolder;

Original file line number	Diff line number	Diff line change
`@@ -266,11 +266,11 @@ public async Task<FsoResult> RunFSO(FsoExecType executableType, string cmdline,`
`266`	`266`	`fso.StartInfo.FileName = prefixCMD[0];`
`267`	`267`	`if (prefixCMD.Length > 1)`
`268`	`268`	`{`
`269`		`- fso.StartInfo.Arguments = prefixCMD[1] + " " + execPath + " " + cmdline;`
	`269`	`+ fso.StartInfo.Arguments = $"{prefixCMD[1]} \"{execPath}\" {cmdline}";`
`270`	`270`	`}`
`271`	`271`	`else`
`272`	`272`	`{`
`273`		`- fso.StartInfo.Arguments = execPath + " " + cmdline;`
	`273`	`+ fso.StartInfo.Arguments = $"\"{execPath}\" {cmdline}";`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static async Task<WineResult> RunTool(string exePath, string exeCmdLine,`
`53`	`53`	`using (var wine = new Process())`
`54`	`54`	`{`
`55`	`55`	`wine.StartInfo.FileName = "wine";`
`56`		`- wine.StartInfo.Arguments = exePath + " " + exeCmdLine;`
	`56`	`+ wine.StartInfo.Arguments = $"\"{exePath}\" {exeCmdLine}";`
`57`	`57`	`if (workingFolder != null)`
`58`	`58`	`{`
`59`	`59`	`wine.StartInfo.WorkingDirectory = workingFolder;`
`@@ -102,7 +102,7 @@ public static async Task<WineResult> RunFred2(string exePath, string exeCmdLine,`
`102`	`102`	`using (var wine = new Process())`
`103`	`103`	`{`
`104`	`104`	`wine.StartInfo.FileName = "wine";`
`105`		`- wine.StartInfo.Arguments = exePath + " " + exeCmdLine;`
	`105`	`+ wine.StartInfo.Arguments = $"\"{exePath}\" {exeCmdLine}";`
`106`	`106`	`if (workingFolder != null)`
`107`	`107`	`{`
`108`	`108`	`wine.StartInfo.WorkingDirectory = workingFolder;`