Re-wrote large parts of the server client architecture. No more fifo.

[plomrogue] / src / client / command_db.c

diff --git a/src/client/command_db.c b/src/client/command_db.c
index f5670a8f207b9638ce420e0775afb5aa492ccfd5..3837d2ab888bb6c8fdb0f86aad4f2964a9b9acb7 100644 (file)
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -3,30 +3,26 @@
 #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 "../common/rexit.h" /* for exit_err() */
+#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 "../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() */
 
 
 
-/* Point "ch_ptr" to next strtok() string in "line" delimited by "delim".*/
-static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim);
-
-
-
-static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim)
+/* Helper to init_command_db(). */
+static void write_line_to_target(char ** target, char * line)
 {
-    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 = "write_line_to_target()";
+    *target = try_malloc(strlen(line), f_name);
+    line[strlen(line) - 1] = '\0';
+    sprintf(*target, "%s", line);
 }
 
 
@@ -39,16 +35,12 @@ extern struct Command * get_command(char * dsc_short)
     {
         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.commandDB.n, err);
-    return cmd_ptr;
+    return NULL;
 }
 
 
@@ -56,34 +48,40 @@ extern struct Command * get_command(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_width(file);
     char line[linemax + 1];
-    world.commandDB.cmds = try_malloc(lines * sizeof(struct Command), f_name);
+    reset_err_try_fgets_counter();
     uint8_t i = 0;
-    char * delim = " ";
-    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;
         }
-        copy_tokenized_string(line, &world.commandDB.cmds[i].dsc_short, delim);
-        copy_tokenized_string(NULL, &world.commandDB.cmds[i].server_msg, delim);
-        if (!strcmp("0", world.commandDB.cmds[i].server_msg))
-        {                                             /*.server_msg==0 detects*/
-            free(world.commandDB.cmds[i].server_msg); /* non-server commands  */
-            world.commandDB.cmds[i].server_msg = NULL;/* in try_key() /       */
-        }                                             /* try_server_command().*/
-        char * arg_string = strtok(NULL, delim);
-        world.commandDB.cmds[i].arg = arg_string[0];
-        copy_tokenized_string(NULL, &world.commandDB.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.commandDB.n = lines;
+    world.commandDB.n = i;
     set_cleanup_flag(CLEANUP_COMMANDS);
 }