From 86ae6d587b740c70d46e0633a92457454dee79fb Mon Sep 17 00:00:00 2001 From: Magnus Eriksson Date: Tue, 5 Mar 2013 07:37:32 +0100 Subject: Fix issues where the filename is referred to as 'sideload' The adb sideload utility referes to the filename as 'sideload' in some places. This patch changes the printouts to display the filename instead. Change-Id: I38ada01a08bed53a8d9697c03f55ce8cee2abe12 Signed-off-by: Magnus Eriksson --- adb/commandline.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adb/commandline.c b/adb/commandline.c index cbe4616..a927423 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -383,7 +383,7 @@ static void format_host_command(char* buffer, size_t buflen, const char* comman } } -int adb_download_buffer(const char *service, const void* data, int sz, +int adb_download_buffer(const char *service, const char *fn, const void* data, int sz, unsigned progress) { char buf[4096]; @@ -419,7 +419,7 @@ int adb_download_buffer(const char *service, const void* data, int sz, sz -= xfer; ptr += xfer; if(progress) { - printf("sending: '%s' %4d%% \r", service, (int)(100LL - ((100LL * sz) / (total)))); + printf("sending: '%s' %4d%% \r", fn, (int)(100LL - ((100LL * sz) / (total)))); fflush(stdout); } } @@ -451,11 +451,11 @@ int adb_download(const char *service, const char *fn, unsigned progress) data = load_file(fn, &sz); if(data == 0) { - fprintf(stderr,"* cannot read '%s' *\n", service); + fprintf(stderr,"* cannot read '%s' *\n", fn); return -1; } - int status = adb_download_buffer(service, data, sz, progress); + int status = adb_download_buffer(service, fn, data, sz, progress); free(data); return status; } -- cgit v1.1