FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore old behaviour of windres so that options containing spaces are not enclosed in double quotes.

Browse source 
PR 4356
	PR 26865
	PR 27594
	* windres.c (quot): Revert previous delta.  Do not use double
	quotes when spaces are detected in options.
	* doc/binutils.texi (windres): Remove suggestion that the
	--preprocessor option can take arguments.
This commit is contained in:
Thomas Wolff 2021-05-10 11:28:15 +01:00 • committed by Nick Clifton
parent 802021d46d
commit 749c700282
3 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
binutils/ChangeLog
View file

@ -1,3 +1,13 @@
2021-05-10 Thomas Wolff <towo@towo.net>
PR 4356
PR 26865
PR 27594
* windres.c (quot): Revert previous delta. Do not use double
quotes when spaces are detected in options.
* doc/binutils.texi (windres): Remove suggestion that the
--preprocessor option can take arguments.
2021-05-10 Alan Modra <amodra@gmail.com>
* dwarf.c (SAFE_BYTE_GET): Check bounds by subtracting amount from

7
binutils/doc/binutils.texi
View file

@ -4278,8 +4278,7 @@ format, which is the first one listed by the @option{--help} option.
@item --preprocessor @var{program}
When @command{windres} reads an @code{rc} file, it runs it through the C
preprocessor first. This option may be used to specify the preprocessor
to use, including any leading arguments. The default preprocessor
argument is @code{gcc}.
to use. The default preprocessor is @code{gcc}.
@item --preprocessor-arg @var{option}
When @command{windres} reads an @code{rc} file, it runs it through
@ -4290,8 +4289,8 @@ preprocessor command line.
If the @option{--preprocessor} option has not been specified then a
default set of preprocessor arguments will be used, with any
@option{--preprocessor-arg} options being placed after them on the
command line. These default arguments are @code{-E -xc-header
-DRC_INVOKED}.
command line. These default arguments are @code{-E},
@code{-xc-header} and @code{-DRC_INVOKED}.
@item -I @var{directory}
@itemx --include-dir @var{directory}

26
binutils/windres.c
View file

@ -710,37 +710,13 @@ quot (const char *string)
buf = (char *) xmalloc (buflen);
}
#if defined (_WIN32) && !defined (__CYGWIN__)
/* For Windows shells, quote "like this". */
{
bool quoted = false;
dest = buf;
if (strchr (string, ' '))
{
quoted = true;
*dest++ = '"';
}
for (src = string; *src; src++, dest++)
{
/* Escape-protect embedded double quotes. */
if (quoted && *src == '"')
*dest++ = '\\';
*dest = *src;
}
if (quoted)
*dest++ = '"';
}
#else
for (src = string, dest = buf; *src; src++, dest++)
{
if (*src == '(' || *src == ')' || *src == ' ')
*dest++ = '\\';
*dest = *src;
}
#endif
*dest = 0;
return buf;
}