X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=68d4ce2dfd7f8908dd188d85b39195e7337fef59;hb=a18ffcfc0b1527b5751ff9c76b8bdb7ee181a764;hp=7d35582dda258abb9472dcee87ce8bd7655d7e8d;hpb=65efdbea2c5978de283aab627ca62f5a2c983353;p=plomrogue diff --git a/src/client/command_db.c b/src/client/command_db.c index 7d35582..68d4ce2 100644 --- a/src/client/command_db.c +++ b/src/client/command_db.c @@ -1,89 +1,111 @@ -/* src/client/command_db.c */ - +/* src/client/command_db.c + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * see the file NOTICE in the root directory of the PlomRogue source package. + */ + +#define _POSIX_C_SOURCE 200809L /* strdup() */ #include "command_db.h" #include /* NULL */ -#include /* uint8_t, uint32_t */ -#include /* FILE */ +#include /* uint8_t */ #include /* free() */ -#include /* memcpy(), strlen(), strtok(), strcmp() */ -#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets() - * textfile_sizes() - */ -#include "../common/rexit.h" /* for exit_err() */ -#include "../common/try_malloc.h" /* try_malloc() */ -#include "cleanup.h" /* set_cleanup_flag() */ +#include /* strcmp(), strdup() */ +#include "array_append.h" /* array_append() */ +#include "parse.h" /* EDIT_STARTED, parse_init_entry(), parse_id_uniq(), + * parse_unknown_arg(), parsetest_too_many_values(), + * parse_file(), parse_and_reduce_to_readyflag(), + * parse_flagval() + */ #include "world.h" /* global world */ +#include "cleanup.h" /* set_cleanup_flag() */ + + + +/* 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 +}; -/* Point "ch_ptr" to next strtok() string in "line" delimited by "delim".*/ -static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim); +/* Interpret "token0" and "token1" 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 "token0" of + * "COMMAND"; or b) of "token0" of NULL is passed. + */ +static void tokens_into_entries(char * token0, char * token1); -static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim) +static void tokens_into_entries(char * token0, char * token1) { - char * f_name = "copy_tokenized_string()"; - char * dsc_ptr = strtok(line, delim); - * ch_ptr = try_malloc(strlen(dsc_ptr) + 1, f_name); - memcpy(* ch_ptr, dsc_ptr, strlen(dsc_ptr) + 1); + char * str_cmd = "COMMAND"; + static uint8_t cmd_flags = READY_CMD; + static struct Command * cmd = NULL; + if (!token0 || !strcmp(token0, str_cmd)) + { + parse_and_reduce_to_readyflag(&cmd_flags, READY_CMD); + if (cmd) + { + array_append(world.commandDB.n, sizeof(struct Command), + (void *) cmd, (void **) &world.commandDB.cmds); + world.commandDB.n++; + free(cmd); + cmd = NULL; + } + } + if (token0) + { + parsetest_too_many_values(); + if (!strcmp(token0, str_cmd)) + { + cmd = (struct Command *) parse_init_entry(&cmd_flags, + sizeof(struct Command)); + cmd->dsc_short = strdup(token1); + parse_id_uniq(!(!get_command(cmd->dsc_short))); + } + else if (!( parse_flagval(token0, token1, "DESCRIPTION", &cmd_flags, + DESC_SET, 's', (char *) &cmd->dsc_long) + || parse_flagval(token0, token1,"SERVER_COMMAND", &cmd_flags, + SERVERCMD_SET, 's',(char *)&cmd->server_msg) + || parse_flagval(token0, token1,"SERVER_ARGUMENT",&cmd_flags, + SERVERARG_SET, 'c', (char *) &cmd->arg))) + { + parse_unknown_arg(); + } + } } extern struct Command * get_command(char * dsc_short) { - struct Command * cmd_ptr = world.cmd_db.cmds; + struct Command * cmd_ptr = world.commandDB.cmds; uint8_t i = 0; - while (i < world.cmd_db.n) + while (i < world.commandDB.n) { if (0 == strcmp(dsc_short, cmd_ptr->dsc_short)) { - break; + return cmd_ptr; } cmd_ptr = &cmd_ptr[1]; i++; } - char * err_start = "get_command_data() failed on request for: "; - char err[strlen(err_start) + strlen(dsc_short) + 1]; - sprintf(err, "%s%s", err_start, dsc_short); - exit_err(i == world.cmd_db.n, err); - return cmd_ptr; + 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; - char * delim = " "; - while (try_fgets(line, linemax + 1, file, f_name)) - { - if ('\n' == line[0] || 0 == line[0]) - { - break; - } - copy_tokenized_string(line, &world.cmd_db.cmds[i].dsc_short, delim); - copy_tokenized_string(NULL, &world.cmd_db.cmds[i].server_msg, delim); - if (!strcmp("0", world.cmd_db.cmds[i].server_msg)) - { - free(world.cmd_db.cmds[i].server_msg); - world.cmd_db.cmds[i].server_msg = NULL; - } - char * arg_string = strtok(NULL, delim); - world.cmd_db.cmds[i].arg = arg_string[0]; - copy_tokenized_string(NULL, &world.cmd_db.cmds[i].dsc_long, "\n"); - i++; - } - try_fclose(file, f_name); - world.cmd_db.n = lines; + parse_file(world.path_commands, tokens_into_entries); set_cleanup_flag(CLEANUP_COMMANDS); } @@ -92,12 +114,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.cmd_db.cmds[i].server_msg); + 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); }