aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-07 13:52:36 +0200
committerMax Kellermann <max@duempel.org>2008-09-07 13:52:36 +0200
commitd2543f03f579c1eaaef187563c2a8d8d984fe60c (patch)
tree98af22eff1b50ee12a3f8580bb78da908ca128d3
parent54371add1349e72684506868f72ee4919fd69b0a (diff)
downloadmpd-d2543f03f579c1eaaef187563c2a8d8d984fe60c.tar.gz
mpd-d2543f03f579c1eaaef187563c2a8d8d984fe60c.tar.xz
mpd-d2543f03f579c1eaaef187563c2a8d8d984fe60c.zip
command: pass struct client to getCommandEntryAnd...()
Instead of passing the file descriptor, pass the client struct to getCommandEntryAndCheckArgcAndPermission().
-rw-r--r--src/command.c47
1 files changed, 21 insertions, 26 deletions
diff --git a/src/command.c b/src/command.c
index 2b81aaf92..20b7ef691 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1385,18 +1385,17 @@ void finishCommands(void)
freeList(commandList);
}
-static int checkArgcAndPermission(CommandEntry * cmd, int fd,
+static int checkArgcAndPermission(CommandEntry * cmd, struct client *client,
int permission, int argc, char *argv[])
{
int min = cmd->min + 1;
int max = cmd->max + 1;
if (cmd->reqPermission != (permission & cmd->reqPermission)) {
- if (fd) {
- commandError(fd, ACK_ERROR_PERMISSION,
- "you don't have permission for \"%s\"",
- cmd->cmd);
- }
+ if (client != NULL)
+ command_error(client, ACK_ERROR_PERMISSION,
+ "you don't have permission for \"%s\"",
+ cmd->cmd);
return -1;
}
@@ -1404,29 +1403,26 @@ static int checkArgcAndPermission(CommandEntry * cmd, int fd,
return 0;
if (min == max && max != argc) {
- if (fd) {
- commandError(fd, ACK_ERROR_ARG,
- "wrong number of arguments for \"%s\"",
- argv[0]);
- }
+ if (client != NULL)
+ command_error(client, ACK_ERROR_ARG,
+ "wrong number of arguments for \"%s\"",
+ argv[0]);
return -1;
} else if (argc < min) {
- if (fd) {
- commandError(fd, ACK_ERROR_ARG,
- "too few arguments for \"%s\"", argv[0]);
- }
+ if (client != NULL)
+ command_error(client, ACK_ERROR_ARG,
+ "too few arguments for \"%s\"", argv[0]);
return -1;
} else if (argc > max && max /* != 0 */ ) {
- if (fd) {
- commandError(fd, ACK_ERROR_ARG,
- "too many arguments for \"%s\"", argv[0]);
- }
+ if (client != NULL)
+ command_error(client, ACK_ERROR_ARG,
+ "too many arguments for \"%s\"", argv[0]);
return -1;
} else
return 0;
}
-static CommandEntry *getCommandEntryAndCheckArgcAndPermission(int fd,
+static CommandEntry *getCommandEntryAndCheckArgcAndPermission(struct client *client,
int *permission,
int argc,
char *argv[])
@@ -1440,16 +1436,15 @@ static CommandEntry *getCommandEntryAndCheckArgcAndPermission(int fd,
return NULL;
if (!findInList(commandList, argv[0], (void *)&cmd)) {
- if (fd) {
- commandError(fd, ACK_ERROR_UNKNOWN,
- "unknown command \"%s\"", argv[0]);
- }
+ if (client != NULL)
+ command_error(client, ACK_ERROR_UNKNOWN,
+ "unknown command \"%s\"", argv[0]);
return NULL;
}
current_command = cmd->cmd;
- if (checkArgcAndPermission(cmd, fd, *permission, argc, argv) < 0) {
+ if (checkArgcAndPermission(cmd, client, *permission, argc, argv) < 0) {
return NULL;
}
@@ -1486,7 +1481,7 @@ static int processCommandInternal(struct client *client,
if (argc == 0)
return 0;
- if ((cmd = getCommandEntryAndCheckArgcAndPermission(fd, permission,
+ if ((cmd = getCommandEntryAndCheckArgcAndPermission(client, permission,
argc, argv))) {
if (!cmdnode || !cmd->listHandler) {
ret = cmd->handler(fd, permission, argc, argv);