X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=68d4ce2dfd7f8908dd188d85b39195e7337fef59;hb=8bf4e35ebe159f9cf051c8dbfc0909d7fe5d3399;hp=57ea2f344acb60e531b529fc5fe11e618b98c639;hpb=d6093b3a7d57aa34d3ee2a84112c59328bf1feed;p=plomrogue

diff --git a/src/client/command_db.c b/src/client/command_db.c
index 57ea2f3..68d4ce2 100644
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -1,28 +1,86 @@
-/* src/client/command_db.c */
+/* src/client/command_db.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
+#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/readwrite.h" /* try_fopen(),try_fclose(),textfile_sizes() */
-#include "../common/rexit.h" /* exit_trouble() */
-#include "../common/try_malloc.h" /* try_malloc() */
-#include "err_try_fgets.h" /* reset_err_try_fgets_counter() */
-#include "misc.h" /* array_append() */
+#include <string.h> /* strcmp(), strdup() */
+#include "array_append.h" /* array_append() */
+#include "parse.h" /* EDIT_STARTED, parse_init_entry(), parse_id_uniq(),
+                    * parse_unknown_arg(), parsetest_too_many_values(),
+                    * parse_file(), parse_and_reduce_to_readyflag(),
+                    * parse_flagval()
+                    */
 #include "world.h" /* global world */
 #include "cleanup.h" /* set_cleanup_flag() */
 
 
 
-/* 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
+};
+
+
+
+/* Interpret "token0" and "token1" 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 "token0" of
+ * "COMMAND"; or b) of "token0" of NULL is passed.
+ */
+static void tokens_into_entries(char * token0, char * token1);
+
+
+
+static void tokens_into_entries(char * token0, char * token1)
+{
+    char * str_cmd = "COMMAND";
+    static uint8_t cmd_flags = READY_CMD;
+    static struct Command * cmd = NULL;
+    if (!token0 || !strcmp(token0, str_cmd))
+    {
+        parse_and_reduce_to_readyflag(&cmd_flags, READY_CMD);
+        if (cmd)
+        {
+            array_append(world.commandDB.n, sizeof(struct Command),
+                         (void *) cmd, (void **) &world.commandDB.cmds);
+            world.commandDB.n++;
+            free(cmd);
+            cmd = NULL;
+        }
+    }
+    if (token0)
+    {
+        parsetest_too_many_values();
+        if      (!strcmp(token0, str_cmd))
+        {
+            cmd = (struct Command *) parse_init_entry(&cmd_flags,
+                                                      sizeof(struct Command));
+            cmd->dsc_short = strdup(token1);
+            parse_id_uniq(!(!get_command(cmd->dsc_short)));
+        }
+        else if (!(   parse_flagval(token0, token1, "DESCRIPTION", &cmd_flags,
+                                    DESC_SET, 's', (char *) &cmd->dsc_long)
+                   || parse_flagval(token0, token1,"SERVER_COMMAND", &cmd_flags,
+                                    SERVERCMD_SET, 's',(char *)&cmd->server_msg)
+                   || parse_flagval(token0, token1,"SERVER_ARGUMENT",&cmd_flags,
+                                    SERVERARG_SET, 'c', (char *) &cmd->arg)))
+        {
+            parse_unknown_arg();
+        }
+    }
 }
 
 
@@ -47,41 +105,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_sizes(file, NULL);
-    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;
+    parse_file(world.path_commands, tokens_into_entries);
     set_cleanup_flag(CLEANUP_COMMANDS);
 }