diff options
| -rw-r--r-- | src/client_process.c | 30 | ||||
| -rw-r--r-- | src/command.c | 29 | ||||
| -rw-r--r-- | src/command.h | 6 |
3 files changed, 30 insertions, 35 deletions
diff --git a/src/client_process.c b/src/client_process.c index 5579b70e..2f69cc6a 100644 --- a/src/client_process.c +++ b/src/client_process.c @@ -25,6 +25,28 @@ #define CLIENT_LIST_OK_MODE_BEGIN "command_list_ok_begin" #define CLIENT_LIST_MODE_END "command_list_end" +static enum command_return +client_process_command_list(struct client *client, bool list_ok, GSList *list) +{ + enum command_return ret = COMMAND_RETURN_OK; + unsigned num = 0; + + for (GSList *cur = list; cur != NULL; cur = g_slist_next(cur)) { + char *cmd = cur->data; + + g_debug("command_process_list: process command \"%s\"", + cmd); + ret = command_process(client, num++, cmd); + g_debug("command_process_list: command returned %i", ret); + if (ret != COMMAND_RETURN_OK || client_is_expired(client)) + break; + else if (list_ok) + client_puts(client, "list_OK\n"); + } + + return ret; +} + enum command_return client_process_line(struct client *client, char *line) { @@ -61,9 +83,9 @@ client_process_line(struct client *client, char *line) to restore the correct order */ client->cmd_list = g_slist_reverse(client->cmd_list); - ret = command_process_list(client, - client->cmd_list_OK, - client->cmd_list); + ret = client_process_command_list(client, + client->cmd_list_OK, + client->cmd_list); g_debug("[%u] process command " "list returned %i", client->num, ret); @@ -104,7 +126,7 @@ client_process_line(struct client *client, char *line) } else { g_debug("[%u] process command \"%s\"", client->num, line); - ret = command_process(client, line); + ret = command_process(client, 0, line); g_debug("[%u] command returned %i", client->num, ret); diff --git a/src/command.c b/src/command.c index 9aff8856..c1c33076 100644 --- a/src/command.c +++ b/src/command.c @@ -1878,7 +1878,7 @@ command_checked_lookup(struct client *client, unsigned permission, } enum command_return -command_process(struct client *client, char *line) +command_process(struct client *client, unsigned num, char *line) { GError *error = NULL; int argc; @@ -1886,6 +1886,8 @@ command_process(struct client *client, char *line) const struct command *cmd; enum command_return ret = COMMAND_RETURN_ERROR; + command_list_num = num; + /* get the command name (first word on the line) */ argv[0] = tokenizer_next_word(&line, &error); @@ -1940,32 +1942,7 @@ command_process(struct client *client, char *line) ret = cmd->handler(client, argc, argv); current_command = NULL; - - return ret; -} - -enum command_return -command_process_list(struct client *client, - bool list_ok, GSList *list) -{ - enum command_return ret = COMMAND_RETURN_OK; - command_list_num = 0; - for (GSList *cur = list; cur != NULL; cur = g_slist_next(cur)) { - char *cmd = cur->data; - - g_debug("command_process_list: process command \"%s\"", - cmd); - ret = command_process(client, cmd); - g_debug("command_process_list: command returned %i", ret); - if (ret != COMMAND_RETURN_OK || client_is_expired(client)) - break; - else if (list_ok) - client_puts(client, "list_OK\n"); - command_list_num++; - } - - command_list_num = 0; return ret; } diff --git a/src/command.h b/src/command.h index a7c408ed..614a414b 100644 --- a/src/command.h +++ b/src/command.h @@ -39,11 +39,7 @@ void command_init(void); void command_finish(void); enum command_return -command_process_list(struct client *client, - bool list_ok, GSList *list); - -enum command_return -command_process(struct client *client, char *commandString); +command_process(struct client *client, unsigned num, char *line); void command_success(struct client *client); |