X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=aed92c95beff5d5450c4b93653f2ac0e0c4304c5;hb=b8783b73fc84895bca8bf02b2604c3b1178bc7d3;hp=4835392318ae2e161b54344fdaa6a32ecd64cb00;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue

diff --git a/src/client/command_db.c b/src/client/command_db.c
index 4835392..aed92c9 100644
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -1,79 +1,46 @@
 /* src/client/command_db.c */
 
 #include "command_db.h"
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint32_t */
-#include <stdio.h> /* FILE */
+#include <stdio.h> /* FILE, sprintf() */
 #include <stdlib.h> /* free() */
-#include <string.h> /* memcpy(), strlen(), strtok(), strcmp() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets()
-                                  * textfile_sizes()
-                                  */
+#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_sizes() */
+#include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "cleanup.h" /* set_cleanup_flag() */
+#include "misc.h" /* array_append() */
 #include "world.h" /* global world */
+#include "cleanup.h" /* set_cleanup_flag() */
 
 
 
-/* Build string pointed to by "ch_ptr" from next token delimited by "delim". */
-static void copy_tokenized_string(char ** ch_ptr, char * delim);
-
-
-
-static void copy_tokenized_string(char ** ch_ptr, char * delim)
-{
-    char * f_name = "copy_tokenized_string()";
-    char * dsc_ptr = strtok(NULL, delim);
-    * ch_ptr = try_malloc(strlen(dsc_ptr) + 1, f_name);
-    memcpy(* ch_ptr, dsc_ptr, strlen(dsc_ptr) + 1);
-}
-
-
-
-extern uint8_t is_command_id_shortdsc(uint8_t id, char * shortdsc)
-{
-    struct Command * cmd_ptr = world.cmd_db.cmds;
-    while (1)
-    {
-        if (id == cmd_ptr->id)
-        {
-            if (strcmp(shortdsc, cmd_ptr->dsc_short))
-            {
-                return 0;
-            }
-            return 1;
-        }
-        cmd_ptr = &cmd_ptr[1];
-    }
-}
-
-
-
-extern uint8_t get_command_id(char * dsc_short)
+/* Helper to init_command_db(). */
+static void write_line_to_target(char ** target, char * line)
 {
-    struct Command * cmd_ptr = world.cmd_db.cmds;
-    while (1)
-    {
-        if (0 == strcmp(dsc_short, cmd_ptr->dsc_short))
-        {
-            return cmd_ptr->id;
-        }
-        cmd_ptr = &cmd_ptr[1];
-    }
+    char * f_name = "write_line_to_target()";
+    *target = try_malloc(strlen(line), f_name);
+    line[strlen(line) - 1] = '\0';
+    sprintf(*target, "%s", line);
 }
 
 
 
-extern char * get_command_longdsc(char * dsc_short)
+extern struct Command * get_command(char * dsc_short)
 {
-    struct Command * cmd_ptr = world.cmd_db.cmds;
-    while (1)
+    struct Command * cmd_ptr = world.commandDB.cmds;
+    uint8_t i = 0;
+    while (i < world.commandDB.n)
     {
         if (0 == strcmp(dsc_short, cmd_ptr->dsc_short))
         {
-            return cmd_ptr->dsc_long;
+            return cmd_ptr;
         }
         cmd_ptr = &cmd_ptr[1];
+        i++;
     }
+    return NULL;
 }
 
 
@@ -81,26 +48,40 @@ extern char * get_command_longdsc(char * dsc_short)
 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 * 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];
-    world.cmd_db.cmds = try_malloc(lines * sizeof(struct Command), f_name);
+    reset_err_try_fgets_counter();
     uint8_t i = 0;
-    while (try_fgets(line, linemax + 1, file, f_name))
+    while (1)
     {
-        if ('\n' == line[0] || 0 == line[0])
+        int test_for_end = try_fgetc(file, f_name);
+        if (EOF == test_for_end || '\n' == test_for_end)
         {
             break;
         }
-        world.cmd_db.cmds[i].id = atoi(strtok(line, " "));
-        copy_tokenized_string(&world.cmd_db.cmds[i].dsc_short, " ");
-        copy_tokenized_string(&world.cmd_db.cmds[i].dsc_long, "\n");
+        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.cmd_db.n = lines;
+    world.commandDB.n = i;
     set_cleanup_flag(CLEANUP_COMMANDS);
 }
 
@@ -109,11 +90,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.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);
 }