maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't remove backslashes from arguments unless the following char is recognized. 

This fixes file paths on Windows, as you can now write, for example,
file d:\foo\bar.txt, but does not break the case that this tokenization
logic was originally designed for, which is to allow escaping of things
like quotes and double quotes, so that all of the escapable characters
can appear in the same string together.

Reviewed by: Jim Ingham, Greg Clayton
Differential Revision: http://reviews.llvm.org/D7018

llvm-svn: 226587
This commit is contained in:
Zachary Turner 2015-01-20 17:53:36 +00:00
parent 95292bbfcd
commit 2d53c31eb7
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/source/Interpreter/Args.cpp
View File

@ -165,7 +165,7 @@ Args::SetCommandString (const char *command)
if (command && command[0]) if (command && command[0])
{ {
static const char *k_space_separators = " \t"; static const char *k_space_separators = " \t";
static const char *k_space_separators_with_slash_and_quotes = " \t \\'\""; static const char *k_escapable_characters = " \t\\'\"";
const char *arg_end = nullptr; const char *arg_end = nullptr;
const char *arg_pos; const char *arg_pos;
for (arg_pos = command; for (arg_pos = command;
@ -201,7 +201,7 @@ Args::SetCommandString (const char *command)
do do
{ {
arg_end = ::strcspn (arg_pos, k_space_separators_with_slash_and_quotes) + arg_pos; arg_end = ::strcspn (arg_pos, k_escapable_characters) + arg_pos;
switch (arg_end[0]) switch (arg_end[0])
{ {
@ -215,7 +215,6 @@ Args::SetCommandString (const char *command)
arg.append (arg_piece_start); arg.append (arg_piece_start);
arg_complete = true; arg_complete = true;
break; break;
case '\\': case '\\':
// Backslash character // Backslash character
switch (arg_end[1]) switch (arg_end[1])
@ -227,22 +226,21 @@ Args::SetCommandString (const char *command)
break; break;
default: default:
if (quote_char == '\0') // Only consider this two-character sequence an escape sequence if we're unquoted and
// the character after the backslash is a whitelisted escapable character. Otherwise
// leave the character sequence untouched.
if (quote_char == '\0' && (nullptr != strchr(k_escapable_characters, arg_end[1])))
{ {
arg.append (arg_piece_start, arg_end - arg_piece_start); arg.append (arg_piece_start, arg_end - arg_piece_start);
if (arg_end[1] != '\0') arg.append (arg_end + 1, 1);
{ arg_pos = arg_end + 2;
arg.append (arg_end + 1, 1); arg_piece_start = arg_pos;
arg_pos = arg_end + 2;
arg_piece_start = arg_pos;
}
} }
else else
arg_pos = arg_end + 2; arg_pos = arg_end + 2;
break; break;
} }
break; break;
case '"': case '"':
case '\'': case '\'':
case '`': case '`':