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

Commit 03f0d27f authored by San Mehat's avatar San Mehat
Browse files

libsysutils: Fix command argument passing bug + whitespace cleanup 



Signed-off-by: default avatarSan Mehat <san@google.com>
parent ebefc48e

libsysutils/src/FrameworkListener.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -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;

libsysutils/src/NetlinkEvent.cpp

+2 −2

File changed.

Contains only whitespace changes.

libsysutils/src/SocketClient.cpp

+2 −2

File changed.

Contains only whitespace changes.

libsysutils/src/SocketListener.cpp

+1 −1

File changed.

Contains only whitespace changes.