openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libsysutils: Handle EINTR in FrameworkClient.cpp 

+ get rid of strcpy + strcat calls.

Change-Id: I47778f3d14aa961474648cddf6510b761f124e74
This commit is contained in:
David 'Digit' Turner 2011-01-17 03:35:28 +01:00
parent c6b0def5f0
commit af91e4ef09
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsysutils/src/FrameworkClient.cpp
View File

@ -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);
}