OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2001-03-15 Martin Hunt <hunt@redhat.com>

Browse Source 
* linespec.c (decode_line_1): Remove trailing quote
	when parsing double quotes.
This commit is contained in:
Martin Hunt 2001-03-15 18:02:14 +00:00
parent f7f5a202bc
commit 77cd5909d2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-15 Martin Hunt <hunt@redhat.com>
* linespec.c (decode_line_1): Remove trailing quote
when parsing double quotes.
2001-03-15 Kevin Buettner <kevinb@redhat.com> 2001-03-15 Kevin Buettner <kevinb@redhat.com>
* uw-thread.c (read_thr_debug, read_map, read_lwp, thread_iter) * uw-thread.c (read_thr_debug, read_map, read_lwp, thread_iter)

10
gdb/linespec.c
View File

@ -1,6 +1,6 @@
/* Parser for linespec for the GNU debugger, GDB. /* Parser for linespec for the GNU debugger, GDB.
Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
1996, 1997, 1998, 1999, 2000 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of GDB. This file is part of GDB.
@ -612,10 +612,11 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
s = NULL; s = NULL;
p = *argptr; p = *argptr;
if (**argptr == '"') if (p[0] == '"')
{ {
is_quote_enclosed = 1; is_quote_enclosed = 1;
(*argptr)++; (*argptr)++;
p++;
} }
else else
is_quote_enclosed = 0; is_quote_enclosed = 0;
@ -654,7 +655,7 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
/* if the closing double quote was left at the end, remove it */ /* if the closing double quote was left at the end, remove it */
if (is_quote_enclosed) if (is_quote_enclosed)
{ {
char *closing_quote = strchr (p, '"'); char *closing_quote = strchr (p - 1, '"');
if (closing_quote && closing_quote[1] == '\0') if (closing_quote && closing_quote[1] == '\0')
*closing_quote = '\0'; *closing_quote = '\0';
} }
@ -1092,9 +1093,6 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
p = skip_quoted (*argptr); p = skip_quoted (*argptr);
} }
if (is_quote_enclosed && **argptr == '"')
(*argptr)++;
copy = (char *) alloca (p - *argptr + 1); copy = (char *) alloca (p - *argptr + 1);
memcpy (copy, *argptr, p - *argptr); memcpy (copy, *argptr, p - *argptr);
copy[p - *argptr] = '\0'; copy[p - *argptr] = '\0';