- 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");
+ char line_copy[strlen(line) + 1];
+ sprintf(line_copy, "%s", line);
+ struct Command cmd;
+ char * arg_string;
+ exit_err(( copy_tokenized_string(line, &cmd.dsc_short, delim)
+ || copy_tokenized_string(NULL, &cmd.server_msg, delim)
+ || NULL == (arg_string = strtok(NULL, delim))
+ || strlen(arg_string) > 1
+ || copy_tokenized_string(NULL, &cmd.dsc_long, "\n")),
+ init_command_db_err(line_copy, i + 1));
+ cmd.arg = arg_string[0];
+ 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. */
+ array_append(i, sizeof(struct Command), (void *) &cmd,
+ (void **) &world.commandDB.cmds);