X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=a37d0d52d83001b86e5cb467f5f97e98d684f2b9;hb=6245b251886853269262bc77d0f0378c28e241bc;hp=4835392318ae2e161b54344fdaa6a32ecd64cb00;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue diff --git a/src/client/command_db.c b/src/client/command_db.c index 4835392..a37d0d5 100644 --- a/src/client/command_db.c +++ b/src/client/command_db.c @@ -1,107 +1,113 @@ /* src/client/command_db.c */ +#define _POSIX_C_SOURCE 200809L /* strdup() */ #include "command_db.h" -#include /* uint8_t, uint32_t */ -#include /* FILE */ +#include /* NULL */ +#include /* uint8_t */ #include /* free() */ -#include /* memcpy(), strlen(), strtok(), strcmp() */ -#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets() - * textfile_sizes() - */ +#include /* memset(), strcmp(), strdup() */ +#include "../common/err_try_fgets.h" /* err_line() */ +#include "../common/parse_file.h" /* Context, EDIT_STARTED, parse_file(), + * set_val() + */ +#include "../common/rexit.h" /* exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "cleanup.h" /* set_cleanup_flag() */ +#include "array_append.h" /* array_append() */ #include "world.h" /* global world */ +#include "cleanup.h" /* set_cleanup_flag() */ -/* Build string pointed to by "ch_ptr" from next token delimited by "delim". */ -static void copy_tokenized_string(char ** ch_ptr, char * delim); +/* Flags for defining state of command DB config file entries. */ +enum cmd_flag +{ + DESC_SET = 0x02, + SERVERCMD_SET = 0x04, + SERVERARG_SET = 0x08, + READY_CMD = DESC_SET +}; -static void copy_tokenized_string(char ** ch_ptr, char * delim) -{ - char * f_name = "copy_tokenized_string()"; - char * dsc_ptr = strtok(NULL, delim); - * ch_ptr = try_malloc(strlen(dsc_ptr) + 1, f_name); - memcpy(* ch_ptr, dsc_ptr, strlen(dsc_ptr) + 1); -} +/* Get tokens from "context" and, by their order (in the individual context and + * in subsequent calls of this function), interpret them as data to write into + * the CommandDB. + * + * Individual CommandDB entries are put together line by line before being + * written. Writing happens after all necessary members of an entry have been + * assembled, and when additionally a) a new entry is started by a + * context->token0 of "COMMAND"; or b) a NULL context->token0 is passed. This is + * interpreted as the CommandDB read's end: appropriate cleanup flags are set. + */ +static void tokens_into_entries(struct Context * context); -extern uint8_t is_command_id_shortdsc(uint8_t id, char * shortdsc) +static void tokens_into_entries(struct Context * context) { - struct Command * cmd_ptr = world.cmd_db.cmds; - while (1) + char * f_name = "tokens_into_entries()"; + char * str_cmd = "COMMAND"; + static uint8_t cmd_flags = READY_CMD; + static struct Command * cmd = NULL; + if (!context->token0 || !strcmp(context->token0, str_cmd)) { - if (id == cmd_ptr->id) + err_line((cmd_flags & READY_CMD) ^ READY_CMD, context->line, + context->err_pre, "Last definition block not finished yet."); + if (cmd) { - if (strcmp(shortdsc, cmd_ptr->dsc_short)) - { - return 0; - } - return 1; + array_append(world.commandDB.n, sizeof(struct Command), + (void *) cmd, (void **) &world.commandDB.cmds); + world.commandDB.n++; + cmd = NULL; } - cmd_ptr = &cmd_ptr[1]; } -} - - - -extern uint8_t get_command_id(char * dsc_short) -{ - struct Command * cmd_ptr = world.cmd_db.cmds; - while (1) + if (!context->token0) { - if (0 == strcmp(dsc_short, cmd_ptr->dsc_short)) - { - return cmd_ptr->id; - } - cmd_ptr = &cmd_ptr[1]; + set_cleanup_flag(CLEANUP_COMMANDS); + } + else if (!strcmp(context->token0, str_cmd)) + { + cmd_flags = EDIT_STARTED; + cmd = try_malloc(sizeof(struct Command), f_name); + memset(cmd, 0, sizeof(struct Command)); + cmd->dsc_short = strdup(context->token1); + err_line(NULL != get_command(cmd->dsc_short), context->line, + context->err_pre, "Declaration of ID already used."); + } + else if (!( set_val(context, "DESCRIPTION", &cmd_flags, + DESC_SET, 's', (char *) &cmd->dsc_long) + || set_val(context, "SERVER_COMMAND", &cmd_flags, + SERVERCMD_SET, 's', (char *) &cmd->server_msg) + || set_val(context, "SERVER_ARGUMENT", &cmd_flags, + SERVERARG_SET, 'c', (char *) &cmd->arg))) + { + err_line(1, context->line, context->err_pre, "Unknown argument"); } } -extern char * get_command_longdsc(char * dsc_short) +extern struct Command * get_command(char * dsc_short) { - struct Command * cmd_ptr = world.cmd_db.cmds; - while (1) + struct Command * cmd_ptr = world.commandDB.cmds; + uint8_t i = 0; + while (i < world.commandDB.n) { if (0 == strcmp(dsc_short, cmd_ptr->dsc_short)) { - return cmd_ptr->dsc_long; + return cmd_ptr; } cmd_ptr = &cmd_ptr[1]; + i++; } + return NULL; } extern void init_command_db() { - char * f_name = "init_command_db()"; - char * path = "confclient/commands"; - FILE * file = try_fopen(path, "r", f_name); - uint32_t lines; - uint32_t linemax = textfile_sizes(file, &lines); - char line[linemax + 1]; - world.cmd_db.cmds = try_malloc(lines * sizeof(struct Command), f_name); - uint8_t i = 0; - while (try_fgets(line, linemax + 1, file, f_name)) - { - if ('\n' == line[0] || 0 == line[0]) - { - break; - } - world.cmd_db.cmds[i].id = atoi(strtok(line, " ")); - copy_tokenized_string(&world.cmd_db.cmds[i].dsc_short, " "); - copy_tokenized_string(&world.cmd_db.cmds[i].dsc_long, "\n"); - i++; - } - try_fclose(file, f_name); - world.cmd_db.n = lines; - set_cleanup_flag(CLEANUP_COMMANDS); + parse_file("confclient/new_commands", tokens_into_entries); } @@ -109,11 +115,12 @@ extern void init_command_db() extern void free_command_db() { uint8_t i = 0; - while (i < world.cmd_db.n) + while (i < world.commandDB.n) { - free(world.cmd_db.cmds[i].dsc_short); - free(world.cmd_db.cmds[i].dsc_long); + free(world.commandDB.cmds[i].dsc_short); + free(world.commandDB.cmds[i].dsc_long); + free(world.commandDB.cmds[i].server_msg); i++; } - free(world.cmd_db.cmds); + free(world.commandDB.cmds); }