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

Commit 4e1149bb authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: replace failing exits in adbd with abort()." 

am: eb62619f

* commit 'eb62619f':
  adb: replace failing exits in adbd with abort().

Change-Id: I6b5b5b61c18b6afb2e1e96cab6ba8704d9115bcc
parents 32045567 eb62619f

adb/adb.cpp

+21 −8
Original line number Original line Diff line number Diff line
@@ -65,21 +65,34 @@ std::string adb_version() { 
void fatal(const char *fmt, ...) {

void fatal(const char *fmt, ...) {

    va_list ap;

    va_list ap;

    va_start(ap, fmt);

    va_start(ap, fmt);

    fprintf(stderr, "error: ");

    char buf[1024];

    vfprintf(stderr, fmt, ap);

    vsnprintf(buf, sizeof(buf), fmt, ap);

    fprintf(stderr, "\n");



#if ADB_HOST

    fprintf(stderr, "error: %s\n", buf);

#else

    LOG(ERROR) << "error: " << buf;

#endif



    va_end(ap);

    va_end(ap);

    exit(-1);

    abort();

}

}





void fatal_errno(const char* fmt, ...) {

void fatal_errno(const char* fmt, ...) {

    int err = errno;

    va_list ap;

    va_list ap;

    va_start(ap, fmt);

    va_start(ap, fmt);

    fprintf(stderr, "error: %s: ", strerror(errno));

    char buf[1024];

    vfprintf(stderr, fmt, ap);

    vsnprintf(buf, sizeof(buf), fmt, ap);

    fprintf(stderr, "\n");



#if ADB_HOST

    fprintf(stderr, "error: %s: %s\n", buf, strerror(err));

#else

    LOG(ERROR) << "error: " << buf << ": " << strerror(err);

#endif



    va_end(ap);

    va_end(ap);

    exit(-1);

    abort();

}

}





apacket* get_apacket(void)

apacket* get_apacket(void)

adb/shell_service.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ int Subprocess::OpenPtyChildFd(const char* pts_name, ScopedFd* error_sfd) { 
        for (const char* message : messages) {

        for (const char* message : messages) {

            WriteFdExactly(error_sfd->fd(), message);

            WriteFdExactly(error_sfd->fd(), message);

        }

        }

        exit(-1);

        abort();

    }

    }





    if (make_pty_raw_) {

    if (make_pty_raw_) {
@@ -421,7 +421,7 @@ int Subprocess::OpenPtyChildFd(const char* pts_name, ScopedFd* error_sfd) { 
            int saved_errno = errno;

            int saved_errno = errno;

            WriteFdExactly(error_sfd->fd(), "tcgetattr failed: ");

            WriteFdExactly(error_sfd->fd(), "tcgetattr failed: ");

            WriteFdExactly(error_sfd->fd(), strerror(saved_errno));

            WriteFdExactly(error_sfd->fd(), strerror(saved_errno));

            exit(-1);

            abort();

        }

        }





        cfmakeraw(&tattr);

        cfmakeraw(&tattr);
@@ -429,7 +429,7 @@ int Subprocess::OpenPtyChildFd(const char* pts_name, ScopedFd* error_sfd) { 
            int saved_errno = errno;

            int saved_errno = errno;

            WriteFdExactly(error_sfd->fd(), "tcsetattr failed: ");

            WriteFdExactly(error_sfd->fd(), "tcsetattr failed: ");

            WriteFdExactly(error_sfd->fd(), strerror(saved_errno));

            WriteFdExactly(error_sfd->fd(), strerror(saved_errno));

            exit(-1);

            abort();

        }

        }

    }

    }