openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 43d65b69: Merge "Escape single quotes in arguments." into lmp-dev 

* commit '43d65b6903249a409031b081bb6175b9ad3e5c2a':
  Escape single quotes in arguments.
This commit is contained in:
Jeff Sharkey 2014-08-06 01:23:28 +00:00 committed by Android Git Automerger
parent fea59faa01 43d65b6903
commit 8c9b155ea1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adb/commandline.c
View File

@ -675,7 +675,12 @@ static void status_window(transport_type ttype, const char* serial)
}
}
/** Duplicate and escape given argument. */
static bool should_escape(const char c)
{
return (c == ' ' || c == '\'' || c == '"' || c == '\\' || c == '(' || c == ')');
}
/* Duplicate and escape given argument. */
static char *escape_arg(const char *s)
{
const char *ts;
@ -686,7 +691,7 @@ static char *escape_arg(const char *s)
alloc_len = 0;
for (ts = s; *ts != '\0'; ts++) {
alloc_len++;
if (*ts == ' ' || *ts == '"' || *ts == '\\' || *ts == '(' || *ts == ')') {
if (should_escape(*ts)) {
alloc_len++;
}
}
@ -704,7 +709,7 @@ static char *escape_arg(const char *s)
dest = ret;
for (ts = s; *ts != '\0'; ts++) {
if (*ts == ' ' || *ts == '"' || *ts == '\\' || *ts == '(' || *ts == ')') {
if (should_escape(*ts)) {
*dest++ = '\\';
}
*dest++ = *ts;