ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libsysutils: Fix command argument passing bug + whitespace cleanup

Browse source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat 2009-05-26 15:18:25 -07:00
parent ebefc48e61
commit 03f0d27f6c
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libsysutils/src/FrameworkListener.cpp
View file

@ -59,9 +59,11 @@ void FrameworkListener::registerCmd(FrameworkCommand *cmd) {
} }
void FrameworkListener::dispatchCommand(SocketClient *cli, char *cmd) { void FrameworkListener::dispatchCommand(SocketClient *cli, char *cmd) {
char *cm, *last; char *next = cmd;
char *cm;
char *arg;
if (!(cm = strtok_r(cmd, ":", &last))) { if (!(cm = strsep(&next, ":"))) {
cli->sendMsg(500, "Malformatted message", false); cli->sendMsg(500, "Malformatted message", false);
return; return;
} }
@ -72,8 +74,7 @@ void FrameworkListener::dispatchCommand(SocketClient *cli, char *cmd) {
FrameworkCommand *c = *i; FrameworkCommand *c = *i;
if (!strcmp(cm, c->getCommand())) { if (!strcmp(cm, c->getCommand())) {
cm += strlen(cm) +1; if (c->runCommand(cli, next)) {
if (c->runCommand(cli, cm)) {
LOGW("Handler '%s' error (%s)", c->getCommand(), strerror(errno)); LOGW("Handler '%s' error (%s)", c->getCommand(), strerror(errno));
} }
return; return;

4
libsysutils/src/NetlinkEvent.cpp
View file

@ -67,9 +67,9 @@ bool NetlinkEvent::decode(char *buffer, int size) {
mAction = NlActionRemove; mAction = NlActionRemove;
else if (!strcmp(a, "change")) else if (!strcmp(a, "change"))
mAction = NlActionChange; mAction = NlActionChange;
} else if (!strncmp(s, "SEQNUM=", strlen("SEQNUM="))) } else if (!strncmp(s, "SEQNUM=", strlen("SEQNUM=")))
mSeq = atoi(s + strlen("SEQNUM=")); mSeq = atoi(s + strlen("SEQNUM="));
else if (!strncmp(s, "SUBSYSTEM=", strlen("SUBSYSTEM="))) else if (!strncmp(s, "SUBSYSTEM=", strlen("SUBSYSTEM=")))
mSubsystem = strdup(s + strlen("SUBSYSTEM=")); mSubsystem = strdup(s + strlen("SUBSYSTEM="));
else else
mParams[param_idx++] = strdup(s); mParams[param_idx++] = strdup(s);

4
libsysutils/src/SocketClient.cpp
View file

@ -16,7 +16,7 @@ SocketClient::SocketClient(int socket) {
int SocketClient::sendMsg(int code, const char *msg, bool addErrno) { int SocketClient::sendMsg(int code, const char *msg, bool addErrno) {
char *buf; char *buf;
if (addErrno) { if (addErrno) {
buf = (char *) alloca(strlen(msg) + strlen(strerror(errno)) + 8); buf = (char *) alloca(strlen(msg) + strlen(strerror(errno)) + 8);
sprintf(buf, "%.3d %s (%s)", code, msg, strerror(errno)); sprintf(buf, "%.3d %s (%s)", code, msg, strerror(errno));
@ -42,7 +42,7 @@ int SocketClient::sendMsg(const char *msg) {
strcat(tmp, "\n"); strcat(tmp, "\n");
bp = tmp; bp = tmp;
} }
int rc = 0; int rc = 0;
const char *p = bp; const char *p = bp;
int brtw = strlen(bp); int brtw = strlen(bp);

2
libsysutils/src/SocketListener.cpp
View file

@ -125,7 +125,7 @@ void SocketListener::runListener() {
max = (*it)->getSocket(); max = (*it)->getSocket();
} }
pthread_mutex_unlock(&mClientsLock); pthread_mutex_unlock(&mClientsLock);
if ((rc = select(max + 1, &read_fds, NULL, NULL, NULL)) < 0) { if ((rc = select(max + 1, &read_fds, NULL, NULL, NULL)) < 0) {
LOGE("select failed (%s)", strerror(errno)); LOGE("select failed (%s)", strerror(errno));
sleep(1); sleep(1);