yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* infcmd.c (construct_inferior_arguments): Handle newlines

Browse Source 
specially.

testsuite/:
	* gdb.base/args.exp: Add tests for newlines.
This commit is contained in:
Andreas Schwab 2008-10-30 10:07:16 +00:00
parent cb5220a03f
commit c22261528c
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2008-10-30 Andreas Schwab <schwab@suse.de>
* infcmd.c (construct_inferior_arguments): Handle newlines
specially.
2008-10-30 Joel Brobecker <brobecker@adacore.com> 2008-10-30 Joel Brobecker <brobecker@adacore.com>
* breakpoint.h (enum bptype): Delete bp_catch_exec. * breakpoint.h (enum bptype): Delete bp_catch_exec.

20
gdb/infcmd.c
View File

@ -270,7 +270,7 @@ construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv)
/* We over-compute the size. It shouldn't matter. */ /* We over-compute the size. It shouldn't matter. */
for (i = 0; i < argc; ++i) for (i = 0; i < argc; ++i)
length += 2 * strlen (argv[i]) + 1 + 2 * (argv[i][0] == '\0'); length += 3 * strlen (argv[i]) + 1 + 2 * (argv[i][0] == '\0');
result = (char *) xmalloc (length); result = (char *) xmalloc (length);
out = result; out = result;
@ -290,9 +290,21 @@ construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv)
{ {
for (cp = argv[i]; *cp; ++cp) for (cp = argv[i]; *cp; ++cp)
{ {
if (strchr (special, *cp) != NULL) if (*cp == '\n')
*out++ = '\\'; {
*out++ = *cp; /* A newline cannot be quoted with a backslash (it
just disappears), only by putting it inside
quotes. */
*out++ = '\'';
*out++ = '\n';
*out++ = '\'';
}
else
{
if (strchr (special, *cp) != NULL)
*out++ = '\\';
*out++ = *cp;
}
} }
} }
} }

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2008-10-30 Andreas Schwab <schwab@suse.de>
* gdb.base/args.exp: Add tests for newlines.
2008-10-30 Joel Brobecker <brobecker@adacore.com> 2008-10-30 Joel Brobecker <brobecker@adacore.com>
gdb.base/foll-exec.exp: Update the expected output of a couple gdb.base/foll-exec.exp: Update the expected output of a couple

8
gdb/testsuite/gdb.base/args.exp
View File

@ -96,4 +96,12 @@ args_test "one empty (with single quotes)" {{1} {''} {3}}
set GDBFLAGS "-nx --args $binfile 1 '' '' 3" set GDBFLAGS "-nx --args $binfile 1 '' '' 3"
args_test "two empty (with single quotes)" {{1} {''} {''} {3}} args_test "two empty (with single quotes)" {{1} {''} {''} {3}}
# try with arguments containing literal newlines.
set GDBFLAGS "-nx --args $binfile 1 {\n} 3"
args_test "one newline" {{1} {\\n} {3}}
set GDBFLAGS "-nx --args $binfile 1 {\n} {\n} 3"
args_test "two newlines" {{1} {\\n} {\\n} {3}}
set GDBFLAGS $old_gdbflags set GDBFLAGS $old_gdbflags