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

Commit 541d7408 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

adb: fail better in install-multiple. 

If we're failing out, don't print any messages from the shutdown code:
it's not interesting (and actively confusing!) to talk about the
"Success" of finalizing an aborted session.

Also fail early if stat fails the first time (we have to tell
PackageManager how much data to expect, for some reason).

Also use `bool` as the boolean type and add quotes around filenames in
error messages.

`install_multi_package` looks like the same nonsense copy & pasted, but
I don't know what that is, and haven't seen any bug reports, so I'm
ignoring that for now.

Bug: http://b/133522725
Test: manual
Change-Id: Id054dff44f21f4c4cc5877dcc2735fc1eb25f9a0
parent a022e47a

adb/client/adb_install.cpp

+19 −16
Original line number Diff line number Diff line
@@ -409,7 +409,8 @@ int install_multiple_app(int argc, const char** argv) { 
            android::base::EndsWithIgnoreCase(file, ".dm") ||

            android::base::EndsWithIgnoreCase(file, ".fsv_sig")) {

            struct stat sb;

            if (stat(file, &sb) != -1) total_size += sb.st_size;

            if (stat(file, &sb) == -1) perror_exit("failed to stat \"%s\"", file);

            total_size += sb.st_size;

            first_apk = i;

        } else {

            break;
@@ -459,13 +460,13 @@ int install_multiple_app(int argc, const char** argv) { 
    }



    // Valid session, now stream the APKs

    int success = 1;

    bool success = true;

    for (int i = first_apk; i < argc; i++) {

        const char* file = argv[i];

        struct stat sb;

        if (stat(file, &sb) == -1) {

            fprintf(stderr, "adb: failed to stat %s: %s\n", file, strerror(errno));

            success = 0;

            fprintf(stderr, "adb: failed to stat \"%s\": %s\n", file, strerror(errno));

            success = false;

            goto finalize_session;

        }
@@ -476,8 +477,8 @@ int install_multiple_app(int argc, const char** argv) { 


        unique_fd local_fd(adb_open(file, O_RDONLY | O_CLOEXEC));

        if (local_fd < 0) {

            fprintf(stderr, "adb: failed to open %s: %s\n", file, strerror(errno));

            success = 0;

            fprintf(stderr, "adb: failed to open \"%s\": %s\n", file, strerror(errno));

            success = false;

            goto finalize_session;

        }
@@ -485,7 +486,7 @@ int install_multiple_app(int argc, const char** argv) { 
        unique_fd remote_fd(adb_connect(cmd, &error));

        if (remote_fd < 0) {

            fprintf(stderr, "adb: connect error for write: %s\n", error.c_str());

            success = 0;

            success = false;

            goto finalize_session;

        }
@@ -493,15 +494,15 @@ int install_multiple_app(int argc, const char** argv) { 
        read_status_line(remote_fd.get(), buf, sizeof(buf));



        if (strncmp("Success", buf, 7)) {

            fprintf(stderr, "adb: failed to write %s\n", file);

            fprintf(stderr, "adb: failed to write \"%s\"\n", file);

            fputs(buf, stderr);

            success = 0;

            success = false;

            goto finalize_session;

        }

    }



finalize_session:

    // Commit session if we streamed everything okay; otherwise abandon

    // Commit session if we streamed everything okay; otherwise abandon.

    std::string service = android::base::StringPrintf("%s install-%s %d", install_cmd.c_str(),

                                                      success ? "commit" : "abandon", session_id);

    {
@@ -512,16 +513,18 @@ finalize_session: 
        }

        read_status_line(fd.get(), buf, sizeof(buf));

    }

    if (!success) return EXIT_FAILURE;



    if (!strncmp("Success", buf, 7)) {

        fputs(buf, stdout);

        return 0;

    }

    if (strncmp("Success", buf, 7)) {

        fprintf(stderr, "adb: failed to finalize session\n");

        fputs(buf, stderr);

        return EXIT_FAILURE;

    }



    fputs(buf, stdout);

    return EXIT_SUCCESS;

}



int install_multi_package(int argc, const char** argv) {

    // Find all APK arguments starting at end.

    // All other arguments passed through verbatim.