Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86ae6d58 authored by Magnus Eriksson's avatar Magnus Eriksson
Browse files

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: default avatarMagnus Eriksson <eriksson.mag@gmail.com>
parent 3fb63338

adb/commandline.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}