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

Commit 108d3d74 authored by David 'Digit' Turner's avatar David 'Digit' Turner Committed by Android (Google) Code Review
Browse files

Merge "libsysutils: Handle EINTR in FrameworkClient.cpp" into honeycomb

parents c7166971 af91e4ef
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -14,13 +14,15 @@ FrameworkClient::FrameworkClient(int socket) {
}

int FrameworkClient::sendMsg(const char *msg) {
    int ret;
    if (mSocket < 0) {
        errno = EHOSTUNREACH;
        return -1;
    }

    pthread_mutex_lock(&mWriteMutex);
    if (write(mSocket, msg, strlen(msg) +1) < 0) {
    ret = TEMP_FAILURE_RETRY(write(mSocket, msg, strlen(msg) +1));
    if (ret < 0) {
        SLOGW("Unable to send msg '%s' (%s)", msg, strerror(errno));
    }
    pthread_mutex_unlock(&mWriteMutex);
@@ -28,13 +30,13 @@ int FrameworkClient::sendMsg(const char *msg) {
}

int FrameworkClient::sendMsg(const char *msg, const char *data) {
    char *buffer = (char *) alloca(strlen(msg) + strlen(data) + 1);
    size_t bufflen = strlen(msg) + strlen(data) + 1;
    char *buffer = (char *) alloca(bufflen);
    if (!buffer) {
        errno = -ENOMEM;
        return -1;
    }
    strcpy(buffer, msg);
    strcat(buffer, data);
    snprintf(buffer, bufflen, "%s%s", msg, data);
    return sendMsg(buffer);
}