Allow spaces in the name of the external preprocessor used by windres.

PR 26865 * windres.c (main): If the preprocessor name includes spaces, ensure that it is quoted.
bminor · Nov 27, 2020 · 21c33bc · 21c33bc · mintty · Mar 17, 2021
1 parent 2c6f3e5
commit 21c33bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-27  Nick Clifton  <nickc@redhat.com>
+
+	PR 26865
+	* windres.c (main): If the preprocessor name includes spaces,
+	ensure that it is quoted.
+
 2020-11-27  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* testsuite/lib/binutils-common.exp (supports_noinit_section): New.

diff --git a/binutils/windres.c b/binutils/windres.c
@@ -885,7 +885,13 @@ main (int argc, char **argv)
 	  break;
 
 	case OPTION_PREPROCESSOR:
-	  preprocessor = optarg;
+	  if (strchr (optarg, ' '))
+	    {
+	      if (asprintf (& preprocessor, "\"%s\"", optarg) == -1)
+		preprocessor = optarg;
+	    }
+	  else
+	    preprocessor = optarg;	    
 	  break;
 
 	case OPTION_PREPROCESSOR_ARG: