#include "cleanup.h" /* set_cleanup_flag() */
#include "world.h" /* global world */
+#include "misc.h"
/* Point "ch_ptr" to next strtok() string in "line" delimited by "delim".*/
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.commandDB.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.commandDB.cmds[i].dsc_short, delim);
- copy_tokenized_string(NULL, &world.commandDB.cmds[i].server_msg, delim);
- if (!strcmp("0", world.commandDB.cmds[i].server_msg))
- { /*.server_msg==0 detects*/
- free(world.commandDB.cmds[i].server_msg); /* non-server commands */
- world.commandDB.cmds[i].server_msg = NULL;/* in try_key() / */
- } /* try_server_command().*/
+ 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.commandDB.cmds[i].arg = arg_string[0];
- copy_tokenized_string(NULL, &world.commandDB.cmds[i].dsc_long, "\n");
+ cmd.arg = arg_string[0];
+ copy_tokenized_string(NULL, &cmd.dsc_long, "\n");
+ array_append(i, sizeof(struct Command), (void *) &cmd,
+ (void **) &world.commandDB.cmds);
i++;
}
try_fclose(file, f_name);
- world.commandDB.n = lines;
+ world.commandDB.n = i;
set_cleanup_flag(CLEANUP_COMMANDS);
}