From af91e4ef095d2c770f1aeceafc1c2e66b645a3c4 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 17 Jan 2011 03:35:28 +0100 Subject: [PATCH] libsysutils: Handle EINTR in FrameworkClient.cpp + get rid of strcpy + strcat calls. Change-Id: I47778f3d14aa961474648cddf6510b761f124e74 --- libsysutils/src/FrameworkClient.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libsysutils/src/FrameworkClient.cpp b/libsysutils/src/FrameworkClient.cpp index 562dd676c..2f3705535 100644 --- a/libsysutils/src/FrameworkClient.cpp +++ b/libsysutils/src/FrameworkClient.cpp @@ -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); }