maint: Merge stable to default.

mmuetzel · mmuetzel · commit 636f73831477 · 2025-05-19T13:35:31.000+02:00
diff --git a/etc/NEWS.10.md b/etc/NEWS.10.md
@@ -33,6 +33,7 @@ Summary of bugs fixed for version 10.2.0 (tbd):
 - Check for undefined output when indexing function output (bug #67111).
 - `perms`: Fix buffer overflow and crash; minor code cleanup (bug #67115).
 - `mkoctfile`: Support spaces in output path of linker step.
+- `mkoctfile`: Support spaces in path to binary when stripping debug info.
 
 
 ### GUI
diff --git a/src/mkoctfile.in.cc b/src/mkoctfile.in.cc
@@ -1384,7 +1384,7 @@ main (int argc, char **sys_argv)
 
   if (strip)
     {
-      std::string cmd = "strip " + octfile;
+      std::string cmd = "strip " + quote_path (octfile);
 
       int status = run_command (cmd, verbose, printonly);
 

Original file line number	Diff line number	Diff line change
`@@ -1384,7 +1384,7 @@ main (int argc, char **sys_argv)`
`1384`	`1384`
`1385`	`1385`	`if (strip)`
`1386`	`1386`	`{`
`1387`		`- std::string cmd = "strip " + octfile;`
	`1387`	`+ std::string cmd = "strip " + quote_path (octfile);`
`1388`	`1388`
`1389`	`1389`	`int status = run_command (cmd, verbose, printonly);`
`1390`	`1390`