Client: Added checks / syntax validation for config files. Also changed commands

[plomrogue] / src / client / command_db.c

diff --git a/src/client/command_db.c b/src/client/command_db.c
index 19cd4064e09c7878d49d841ed1e86d30536ffc58..57ea2f344acb60e531b529fc5fe11e618b98c639 100644 (file)
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -5,50 +5,24 @@
 #include <stdint.h> /* uint8_t, uint32_t */
 #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/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 "err_try_fgets.h" /* reset_err_try_fgets_counter() */
 #include "misc.h" /* array_append() */
 #include "world.h" /* global world */
+#include "cleanup.h" /* set_cleanup_flag() */
 
 
 
-/* Helpers to init_command_db(). */
-static uint8_t copy_tokenized_string(char * line, char ** ch_ptr, char * delim);
-static char * init_command_db_err(char * line_copy, uint8_t line_number);
-
-
-static uint8_t copy_tokenized_string(char * line, char ** ch_ptr, char * delim)
-{
-    char * f_name = "copy_tokenized_string()";
-    char * dsc_ptr = strtok(line, delim);
-    if (!dsc_ptr)
-    {
-        return 1;
-    }
-    * ch_ptr = try_malloc(strlen(dsc_ptr) + 1, f_name);
-    memcpy(* ch_ptr, dsc_ptr, strlen(dsc_ptr) + 1);
-    return 0;
-}
-
-
-
-static char * init_command_db_err(char * line_copy, uint8_t line_number)
+/* Helper to init_command_db(). */
+static void write_line_to_target(char ** target, char * line)
 {
-    char * f_name = "init_command_db_err";
-    char * err_start = "Failed reading command config file at ";
-    char * err_middle = " due to malformed line ";
-    line_copy[strlen(line_copy) - 1] = '\0';
-    char * err = try_malloc(strlen(err_start) + strlen(world.path_commands) +
-                            strlen(err_middle) + 3 + 2 + strlen(line_copy) + 1,
-                            f_name);
-    sprintf(err, "%s%s%s%d: %s", err_start, world.path_commands, err_middle,
-            line_number, line_copy);
-    return err;
+    char * f_name = "write_line_to_target()";
+    *target = try_malloc(strlen(line), f_name);
+    line[strlen(line) - 1] = '\0';
+    sprintf(*target, "%s", line);
 }
 
 
@@ -61,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;
 }
 
 
@@ -78,34 +48,34 @@ 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 lines;
-    uint32_t linemax = textfile_sizes(file, &lines);
+    uint32_t linemax = textfile_sizes(file, NULL);
     char line[linemax + 1];
+    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;
         }
-        char line_copy[strlen(line) + 1];
-        sprintf(line_copy, "%s", line);
+        exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()");
         struct Command cmd;
-        char * arg_string;
-        exit_err((  copy_tokenized_string(line, &cmd.dsc_short, delim)
-                 || copy_tokenized_string(NULL, &cmd.server_msg, delim)
-                 || NULL == (arg_string = strtok(NULL, delim))
-                 || strlen(arg_string) > 1
-                 || copy_tokenized_string(NULL, &cmd.dsc_long, "\n")),
-                 init_command_db_err(line_copy, i + 1));
-        cmd.arg = arg_string[0];
-        if (!strcmp("0", cmd.server_msg))
-        {                          /* A .server_msg == NULL helps control.c's */
-            free(cmd.server_msg);  /* try_key() and try_server_command() to   */
-            cmd.server_msg = NULL; /* differentiate server commands from      */
-        }                          /* non-server commands.                    */
+        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++;