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

Restore readelf's string dump to previous behaviour where newlines were caused line breaks.

Browse source 
PR 25543
	* readelf.c (dump_section_as_strings): Display new-line characters
	as \n and then insert a line break.
	* testsuite/binutils-all/pr25543.s: New test.
	* testsuite/binutils-all/pr25543.d: Test driver.
	* testsuite/binutils-all/readelf.exp: Run the new test.
This commit is contained in:
Nick Clifton 2020-03-02 10:02:02 +00:00
parent cb001c0d28
commit ba3265d04c
5 changed files with 102 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

80
binutils/readelf.c
View file

@ -13732,6 +13732,14 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata)
end = start + num_bytes;
some_strings_shown = FALSE;
#ifdef HAVE_MBSTATE_T
mbstate_t state;
/* Initialise the multibyte conversion state. */
memset (& state, 0, sizeof (state));
#endif
bfd_boolean continuing = FALSE;
while (data < end)
{
while (!ISPRINT (* data))
@ -13742,18 +13750,76 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata)
{
size_t maxlen = end - data;
if (continuing)
{
printf (" ");
continuing = FALSE;
}
else
{
#ifndef __MSVCRT__
/* PR 11128: Use two separate invocations in order to work
around bugs in the Solaris 8 implementation of printf. */
printf (" [%6tx] ", data - start);
/* PR 11128: Use two separate invocations in order to work
around bugs in the Solaris 8 implementation of printf. */
printf (" [%6tx] ", data - start);
#else
printf (" [%6Ix] ", (size_t) (data - start));
printf (" [%6Ix] ", (size_t) (data - start));
#endif
}
if (maxlen > 0)
{
print_symbol ((int) maxlen, (const char *) data);
putchar ('\n');
data += strnlen ((const char *) data, maxlen);
char c;
while (maxlen)
{
c = *data++;
if (c == 0)
break;
/* PR 25543: Treat new-lines as string-ending characters. */
if (c == '\n')
{
printf ("\\n\n");
if (*data != 0)
continuing = TRUE;
break;
}
/* Do not print control characters directly as they can affect terminal
settings. Such characters usually appear in the names generated
by the assembler for local labels. */
if (ISCNTRL (c))
{
printf ("^%c", c + 0x40);
}
else if (ISPRINT (c))
{
putchar (c);
}
else
{
size_t n;
#ifdef HAVE_MBSTATE_T
wchar_t w;
#endif
/* Let printf do the hard work of displaying multibyte characters. */
printf ("%.1s", data - 1);
#ifdef HAVE_MBSTATE_T
/* Try to find out how many bytes made up the character that was
just printed. Advance the symbol pointer past the bytes that
were displayed. */
n = mbrtowc (& w, (char *)(data - 1), MB_CUR_MAX, & state);
#else
n = 1;
#endif
if (n != (size_t) -1 && n != (size_t) -2 && n > 0)
data += (n - 1);
}
}
if (c != '\n')
putchar ('\n');
}
else
{