Escape single quotes in arguments.
Verified that these use-cases continue working:
$ adb shell arg a a 'b b'
$ adb shell arg a a "b b"
|arg|a|a|b b|
$ adb shell arg "a a 'b b'"
|arg|a a 'b b'|
$ adb shell arg 'a a "b b"'
|arg|a a "b b"|
$ adb shell arg a\"b\'c
|arg|a"b'c|
$ adb shell "arg a && arg b"
|arg|a|
|arg|b|
$ adb shell "arg 'a' \"b\" c"
|arg|a|b|c|
Bug: 16139781
Change-Id: I3b010b6cdf57281695c11fda318c9bea0a7221cc
diff --git a/commandline.c b/commandline.c
index e1ff856..af21e38 100644
--- a/commandline.c
+++ b/commandline.c
@@ -675,7 +675,12 @@
}
}
-/** 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 @@
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 @@
dest = ret;
for (ts = s; *ts != '\0'; ts++) {
- if (*ts == ' ' || *ts == '"' || *ts == '\\' || *ts == '(' || *ts == ')') {
+ if (should_escape(*ts)) {
*dest++ = '\\';
}
*dest++ = *ts;