/* src/client/command_db.c */
#include "command_db.h"
+#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint32_t */
#include <stdio.h> /* FILE */
#include <stdlib.h> /* free() */
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))
{
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);
+ exit_err(i == world.commandDB.n, err);
return cmd_ptr;
}
extern void init_command_db()
{
char * f_name = "init_command_db()";
- char * path = "confclient/commands";
- FILE * file = try_fopen(path, "r", f_name);
+ FILE * file = try_fopen(world.path_commands, "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))
{
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;
- }
+ struct Command cmd;
+ copy_tokenized_string(line, &cmd.dsc_short, delim);
+ copy_tokenized_string(NULL, &cmd.server_msg, delim);
+ if (!strcmp("0", cmd.server_msg))
+ { /* A .server_msg == NULL helps control.c's */
+ free(cmd.server_msg); /* try_key() and try_server_command() to */
+ cmd.server_msg = NULL; /* differentiate server commands from */
+ } /* non-server commands. */
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");
+ cmd.arg = arg_string[0];
+ copy_tokenized_string(NULL, &cmd.dsc_long, "\n");
+ uint32_t old_size = i * sizeof(struct Command);
+ uint32_t new_size = old_size + sizeof(struct Command);
+ struct Command * new_cmds = try_malloc(new_size, f_name);
+ memcpy(new_cmds, world.commandDB.cmds, old_size);
+ new_cmds[i] = cmd;
+ free(world.commandDB.cmds);
+ world.commandDB.cmds = new_cmds;
i++;
}
try_fclose(file, f_name);
- world.cmd_db.n = lines;
+ world.commandDB.n = i;
set_cleanup_flag(CLEANUP_COMMANDS);
}
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);
}