commit 43d65b6903249a409031b081bb6175b9ad3e5c2a
author Jeff Sharkey <jsharkey@android.com> Wed Aug 06 00:39:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 05 00:19:02 2014 +0000
tree ca39fe72f4cbb304b076add7bfc31bd6fee0bf90
parent d9c4b14b44e93006efdffb059b769d46af509e2d
parent d0eee747f6389a5800b485f36b265b3f5521852f

Merge "Escape single quotes in arguments." into lmp-dev

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index e1ff856..af21e38 100644
--- a/adb/commandline.c
+++ b/adb/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;