work on ACK error codes

git-svn-id: https://svn.musicpd.org/mpd/trunk@1324 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-06-04 01:58:31 +00:00
parent d22e5ec522
commit f958e0a4c5
4 changed files with 43 additions and 37 deletions

View File

@@ -106,6 +106,9 @@ struct _CommandEntry {
CommandListHandlerFunction listHandler;
};
char * current_command = NULL;
int command_listNum = 0;
CommandEntry * getCommandEntryFromString(char * string, int * permission);
List * commandList;
@@ -679,8 +682,11 @@ int checkArgcAndPermission(CommandEntry * cmd, FILE *fp,
CommandEntry * getCommandEntryAndCheckArgcAndPermission(FILE * fp,
unsigned int * permission, int argArrayLength, char ** argArray)
{
static char unknown[] = "";
CommandEntry * cmd;
current_command = unknown;
if(argArrayLength == 0) return NULL;
if(!findInList(commandList, argArray[0],(void *)&cmd)) {
@@ -688,6 +694,8 @@ CommandEntry * getCommandEntryAndCheckArgcAndPermission(FILE * fp,
return NULL;
}
current_command = cmd->cmd;
if(checkArgcAndPermission(cmd, fp, *permission, argArrayLength,
argArray) < 0)
{
@@ -739,6 +747,8 @@ int processCommandInternal(FILE * fp, unsigned int * permission,
freeArgArray(argArray,argArrayLength);
current_command = NULL;
return ret;
}
@@ -749,6 +759,8 @@ int proccessListOfCommands(FILE * fp, int * permission, int * expired,
ListNode * tempNode;
int ret = 0;
command_listNum = 0;
while(node!=NULL) {
DEBUG("proccesListOfCommands: process command \"%s\"\n",
node->data);
@@ -759,7 +771,10 @@ int proccessListOfCommands(FILE * fp, int * permission, int * expired,
deleteNodeFromList(list,node);
node = tempNode;
if(ret!=0 || (*expired)!=0) node = NULL;
command_listNum++;
}
command_listNum = 0;
return ret;
}
@@ -767,4 +782,3 @@ int proccessListOfCommands(FILE * fp, int * permission, int * expired,
int processCommand(FILE * fp, unsigned int * permission, char * commandString) {
return processCommandInternal(fp,permission,commandString,NULL);
}
/* vim:set shiftwidth=4 tabstop=8 expandtab: */