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

* linespec.c (decode_line_1): Update comments for is_quote_enclosed. 

If the filename portion of the linespec was quoted, recheck the
	remainder for additional quoting.
	(locate_first_half): Skip over completer chars, too.
This commit is contained in:
Keith Seitz 2010-03-04 18:38:35 +00:00
parent 0c199f28ac
commit 0e0b460e6a
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2010-03-04 Keith Seitz <keiths@redhat.com>
* linespec.c (decode_line_1): Update comments for is_quote_enclosed.
If the filename portion of the linespec was quoted, recheck the
remainder for additional quoting.
(locate_first_half): Skip over completer chars, too.
2010-03-04 Tom Tromey <tromey@redhat.com>
* printcmd.c (printf_command): Pass dummy argument to

32
gdb/linespec.c
View File

@ -694,12 +694,14 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
/* This says whether or not something in *ARGPTR is quoted with
completer_quotes (i.e. with single quotes). */
int is_quoted;
/* Is part of *ARGPTR is enclosed in double quotes? */
/* Is *ARGPTR is enclosed in double quotes? */
int is_quote_enclosed;
int is_objc_method = 0;
char *saved_arg = *argptr;
/* If IS_QUOTED, the end of the quoted bit. */
char *end_quote = NULL;
/* The "first half" of the linespec. */
char *first_half;
if (not_found_ptr)
*not_found_ptr = 0;
@ -731,7 +733,7 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
will point to "". If this is a C++ name, like "A::B::foo", p will
point to "::B::foo". Argptr is not changed by this call. */
p = locate_first_half (argptr, &is_quote_enclosed);
first_half = p = locate_first_half (argptr, &is_quote_enclosed);
/* Check if this is an Objective-C method (anything that starts with
a '+' or '-' and a '['). */
@ -751,9 +753,6 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
return values;
}
if (is_quoted)
*argptr = *argptr + 1;
/* Does it look like there actually were two parts? */
if (p[0] == ':' || p[0] == '.')
@ -828,6 +827,17 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
/* file_symtab is specified file's symtab, or 0 if no file specified.
arg no longer contains the file name. */
/* If the filename was quoted, we must re-check the quotation. */
if (end_quote == first_half && *end_quote!= '\0')
{
is_quoted = (**argptr
&& strchr (get_gdb_completer_quote_characters (),
**argptr) != NULL);
if (is_quoted)
end_quote = skip_quoted (*argptr);
}
/* Check whether arg is all digits (and sign). */
q = *argptr;
@ -1056,7 +1066,14 @@ locate_first_half (char **argptr, int *is_quote_enclosed)
p++;
}
else
*is_quote_enclosed = 0;
{
*is_quote_enclosed = 0;
if (strchr (get_gdb_completer_quote_characters (), *p))
{
++(*argptr);
++p;
}
}
for (; *p; p++)
{
if (p[0] == '<')
@ -1574,7 +1591,8 @@ symtab_from_filename (char **argptr, char *p, int is_quote_enclosed,
copy = (char *) alloca (p - *argptr + 1);
memcpy (copy, *argptr, p - *argptr);
/* It may have the ending quote right after the file name. */
if (is_quote_enclosed && copy[p - *argptr - 1] == '"')
if ((is_quote_enclosed && copy[p - *argptr - 1] == '"')
|| copy[p - *argptr - 1] == '\'')
copy[p - *argptr - 1] = 0;
else
copy[p - *argptr] = 0;