From 41b3cfa29602d5f5065e7eafc25692cd75dc1871 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 9 Sep 2014 12:38:30 -0700
Subject: [PATCH] delete_file() should force removal.

It's a shell command with a pty, but it's not really interactive,
so force the removal to avoid giving users dead-end prompts.

Bug: 17339227
Change-Id: Iaf5d95c49f032066aa741a711a2c45557d93c598
---
 adb/commandline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adb/commandline.c b/adb/commandline.c
index b268ca5e8..51c039efc 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -1870,7 +1870,7 @@ static int delete_file(transport_type transport, char* serial, char* filename)
     char buf[4096];
     char* quoted;
 
-    snprintf(buf, sizeof(buf), "shell:rm ");
+    snprintf(buf, sizeof(buf), "shell:rm -f ");
     quoted = escape_arg(filename);
     strncat(buf, quoted, sizeof(buf)-1);
     free(quoted);