libsysutils: Fix command argument passing bug + whitespace cleanup

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

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;