X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;fp=src%2Fclient%2Fcommand_db.c;h=a37d0d52d83001b86e5cb467f5f97e98d684f2b9;hb=6245b251886853269262bc77d0f0378c28e241bc;hp=06329fc28b63934e18741845003366ec6ae6f1ee;hpb=895ac8aaa7694f3e1759abe4de934eaafdb8d009;p=plomrogue

diff --git a/src/client/command_db.c b/src/client/command_db.c
index 06329fc..a37d0d5 100644
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -1,13 +1,15 @@
 /* src/client/command_db.c */
 
+#define _POSIX_C_SOURCE 200809L /* strdup() */
 #include "command_db.h"
 #include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint32_t */
-#include <stdio.h> /* FILE, sprintf() */
+#include <stdint.h> /* uint8_t */
 #include <stdlib.h> /* free() */
-#include <string.h> /* memset(), strlen(), strcmp() */
-#include "../common/err_try_fgets.h" /* reset_err_try_fgets_counter() */
-#include "../common/readwrite.h" /* try_fopen(),try_fclose(),textfile_width() */
+#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 "array_append.h" /* array_append() */
@@ -16,13 +18,71 @@
 
 
 
-/* Helper to init_command_db(). */
-static void write_line_to_target(char ** target, char * line)
+/* Flags for defining state of command DB config file entries. */
+enum cmd_flag
 {
-    char * f_name = "write_line_to_target()";
-    *target = try_malloc(strlen(line), f_name);
-    line[strlen(line) - 1] = '\0';
-    sprintf(*target, "%s", line);
+    DESC_SET      = 0x02,
+    SERVERCMD_SET = 0x04,
+    SERVERARG_SET = 0x08,
+    READY_CMD = DESC_SET
+};
+
+
+
+/* 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 tokens_into_entries(struct Context * context)
+{
+    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");
+    }
 }
 
 
@@ -47,42 +107,7 @@ extern struct Command * get_command(char * dsc_short)
 
 extern void init_command_db()
 {
-    char * f_name = "init_command_db()";
-    char * context = "Failed reading command DB file. ";
-    FILE * file = try_fopen(world.path_commands, "r", f_name);
-    uint32_t linemax = textfile_width(file);
-    char line[linemax + 1];
-    reset_err_try_fgets_counter();
-    uint8_t i = 0;
-    while (1)
-    {
-        int test_for_end = try_fgetc(file, f_name);
-        if (EOF == test_for_end || '\n' == test_for_end)
-        {
-            break;
-        }
-        exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()");
-        struct Command cmd;
-        memset(&cmd, 0, sizeof(struct Command));
-        err_try_fgets(line, linemax, file, context, "nf");
-        write_line_to_target(&cmd.dsc_short, line);
-        err_try_fgets(line, linemax, file, context, "0nf");
-        write_line_to_target(&cmd.dsc_long, line);
-        err_try_fgets(line, linemax, file, context, "0nf");
-        if (strcmp(world.delim, line))
-        {
-            write_line_to_target(&cmd.server_msg, line);
-            err_try_fgets(line, linemax, file, context, "0nfs");
-            cmd.arg = line[0];
-            err_try_fgets(line, linemax, file, context, "d");
-        }
-        array_append(i, sizeof(struct Command), (void *) &cmd,
-                     (void **) &world.commandDB.cmds);
-        i++;
-    }
-    try_fclose(file, f_name);
-    world.commandDB.n = i;
-    set_cleanup_flag(CLEANUP_COMMANDS);
+    parse_file("confclient/new_commands", tokens_into_entries);
 }