home · contact · privacy
Make client's commandDB reading use new parsing / config file format.
[plomrogue] / src / client / command_db.c
index fa125c45171b70877ed552df1974e5073eb16e55..a37d0d52d83001b86e5cb467f5f97e98d684f2b9 100644 (file)
 /* src/client/command_db.c */
 
+#define _POSIX_C_SOURCE 200809L /* strdup() */
 #include "command_db.h"
-#include <stdint.h> /* uint8_t, uint32_t */
-#include <stdio.h> /* FILE */
+#include <stddef.h> /* NULL */
+#include <stdint.h> /* uint8_t */
 #include <stdlib.h> /* free() */
-#include <string.h> /* memcpy(), strlen(), strtok(), strcmp() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets()
-                                  * textfile_sizes()
-                                  */
-#include "../common/rexit.h" /* for exit_err() */
+#include <string.h> /* 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() */
+
+
+
+/* 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);
+/* 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);
 
 
 
-static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim)
+static void tokens_into_entries(struct Context * context)
 {
-    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 * 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))
+    {
+        err_line((cmd_flags & READY_CMD) ^ READY_CMD, context->line,
+                  context->err_pre, "Last definition block not finished yet.");
+        if (cmd)
+        {
+            array_append(world.commandDB.n, sizeof(struct Command),
+                         (void *) cmd, (void **) &world.commandDB.cmds);
+            world.commandDB.n++;
+            cmd = NULL;
+        }
+    }
+    if (!context->token0)
+    {
+        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 struct Command * get_command_data(char * dsc_short)
+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;
-    set_cleanup_flag(CLEANUP_COMMANDS);
+    parse_file("confclient/new_commands", tokens_into_entries);
 }
 
 
@@ -91,12 +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.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);
 }