Still working on it...

3 files changed, 378 insertions, 20 deletions

diff --git a/src/config/parameters/parameters.c b/src/config/parameters/parameters.c
index c8db4fa..ac6a790 100644
--- a/src/config/parameters/parameters.c
+++ b/src/config/parameters/parameters.c
@@ -17,11 +17,11 @@
 static int parse_axis
 (
    const int argc,
-   const char * argv [const restrict static argc],
-   struct relabsd_axis axes [const restrict static RELABSD_AXIS_AXES_COUNT]
+   const char * const argv [const restrict static argc],
+   struct relabsd_axis axes [const static RELABSD_AXIS_VALID_AXES_COUNT]
 )
 {
-   enum relabsd_axis_name axis_name;
+   enum relabsd_axis_name axis_index;
    struct relabsd_axis *axis;
 
    if (argc < 7)
@@ -31,7 +31,7 @@ static int parse_axis
       return -1;
    }
 
-   axis_index = relabsd_axis_from_name(argv[0]);
+   axis_index = relabsd_axis_parse_name(argv[0]);
 
    if (axis_index == RELABSD_UNKNOWN)
    {
@@ -90,7 +90,7 @@ static int parse_axis
 int relabsd_parameters_parse_execution_mode
 (
    const int argc,
-   const char * argv [const restrict static argc],
+   const char * const argv [const restrict static argc],
    struct relabsd_parameters parameters [const restrict static 1]
 )
 {
@@ -110,7 +110,7 @@ int relabsd_parameters_parse_execution_mode
    )
    {
       parameters->mode = RELABSD_PARAMETERS_COMPATIBILITY_TEST_MODE;
-      parameters->physical_device_name = argv[2];
+      parameters->physical_device_file_name = argv[2];
       parameters->read_argc = 2;
    }
    else if
@@ -121,7 +121,7 @@ int relabsd_parameters_parse_execution_mode
    {
       parameters->mode = RELABSD_PARAMETERS_CLIENT_MODE;
       parameters->communication_node_name = argv[2];
-      parameters->physical_device_name = (const char *) NULL;
+      parameters->physical_device_file_name = (const char *) NULL;
       parameters->read_argc = 2;
    }
    else if
@@ -132,7 +132,7 @@ int relabsd_parameters_parse_execution_mode
    {
       parameters->mode = RELABSD_PARAMETERS_SERVER_MODE;
       parameters->communication_node_name = argv[2];
-      parameters->physical_device_name = argv[3];
+      parameters->physical_device_file_name = argv[3];
       parameters->read_argc = 3;
    }
    else if
@@ -143,7 +143,7 @@ int relabsd_parameters_parse_execution_mode
    {
       parameters->mode = RELABSD_PARAMETERS_SERVER_MODE;
       parameters->communication_node_name = (char *) NULL;
-      parameters->physical_device_name = argv[2];
+      parameters->physical_device_file_name = argv[2];
       parameters->read_argc = 2;
    }
    else
@@ -172,11 +172,11 @@ int relabsd_parameters_parse_options
    relabsd_parameters_initialize_options(parameters);
 
    /*
-    * i = (params->read_argc + 1) because reading 2 params is actually reaching
-    * the [2] element of the array, since the [0] element is the executable
-    * name.
+    * i = (parameters->read_argc + 1) because reading 2 params is actually
+    * reaching the [2] element of the array, since the [0] element is the
+    * executable name.
     */
-   for (i = (params->read_argc + 1); i < argc; ++i)
+   for (i = (parameters->read_argc + 1); i < argc; ++i)
    {
       if
       (
@@ -184,9 +184,9 @@ int relabsd_parameters_parse_options
          || RELABSD_STRING_EQUALS("--daemon", argv[i])
       )
       {
-         params->run_as_daemon = 1;
+         parameters->run_as_daemon = 1;
 
-         if (params->node == ((char *) NULL))
+         if (parameters->communication_node_name == ((char *) NULL))
          {
             RELABSD_S_WARNING
             (
@@ -208,7 +208,7 @@ int relabsd_parameters_parse_options
          }
 
          ++i;
-         params->device_name = argv[i];
+         parameters->device_name = argv[i];
       }
       else if
       (
@@ -228,7 +228,13 @@ int relabsd_parameters_parse_options
 
          if
          (
-            relabsd_util_parse_int(argv[i], 0, INT_MAX, &(params->timeout))
+            relabsd_util_parse_int
+            (
+               argv[i],
+               0,
+               INT_MAX,
+               &(parameters->timeout)
+            )
             < 0
          )
          {
@@ -261,7 +267,7 @@ int relabsd_parameters_parse_options
 
          ++i;
 
-         if (parse_axis((argc - i), (argv + i), params->axes) < 0)
+         if (parse_axis((argc - i), (argv + i), parameters->axes) < 0)
          {
             relabsd_parameters_print_usage(argv[0]);
 
@@ -283,7 +289,7 @@ int relabsd_parameters_parse_options
          }
 
          ++i;
-         params->configuration_file = argv[i];
+         parameters->configuration_file = argv[i];
       }
       else
       {
diff --git a/src/config/parameters/parameters_accessors.c b/src/config/parameters/parameters_accessors.c
index e53cfe0..e1fd805 100644
--- a/src/config/parameters/parameters_accessors.c
+++ b/src/config/parameters/parameters_accessors.c
@@ -1,3 +1,7 @@
+/**** POSIXS ^*****************************************************************/
+#include <stdlib.h>
+
+/**** RELABSD *****************************************************************/
 #include <relabsd/config/parameters.h>
 
 /******************************************************************************/
@@ -9,7 +13,7 @@
 /******************************************************************************/
 void relabsd_parameters_initialize_options
 (
-   const struct relabsd_parameters parameters [const restrict static 1]
+   struct relabsd_parameters parameters [const restrict static 1]
 )
 {
    parameters->run_as_daemon = 0;
diff --git a/src/config/parameters/parse_config_file.c b/src/config/parameters/parse_config_file.c
new file mode 100644
index 0000000..a6920b4
--- /dev/null
+++ b/src/config/parameters/parse_config_file.c
@@ -0,0 +1,348 @@
+/**** POSIX *******************************************************************/
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include <sys/time.h>
+
+/**** RELABSD *****************************************************************/
+#include <relabsd/config.h>
+#include <relabsd/debug.h>
+
+#include <relabsd/config/parameters.h>
+
+#include <relabsd/device/axis.h>
+
+#include <relabsd/util/string.h>
+
+
+/* TODO: move this to relabsd/config.h */
+#ifndef RELABSD_OPTION_MAX_SIZE
+   #define RELABSD_OPTION_MAX_SIZE 64
+#endif
+
+/******************************************************************************/
+/**** LOCAL FUNCTIONS *********************************************************/
+/******************************************************************************/
+
+/*
+ * Returns -1 on error,
+ *          0 on EOF,
+ *          1 on newline.
+ */
+static int read_axis_options
+(
+   FILE file [const restrict static 1],
+   const char axis_name [const restrict static 1],
+   struct relabsd_axis axis [const restrict static 1]
+)
+{
+   char option[(RELABSD_OPTION_MAX_SIZE + 1)];
+   int i;
+   char c;
+
+   option[RELABSD_OPTION_MAX_SIZE] = '\0';
+
+   i = 0;
+
+   while (i <= RELABSD_OPTION_MAX_SIZE)
+   {
+      c = (char) getc(file);
+
+      if (c == EOF)
+      {
+         if (ferror(file))
+         {
+            RELABSD_FATAL
+            (
+               "Reading error while parsing an option in the configuration file"
+               " (axis '%s').",
+               axis_name
+            );
+         }
+         else
+         {
+            RELABSD_FATAL
+            (
+               "End of file reached while parsing an option in the"
+               " configuration file (axis '%s').",
+               axis_name
+            );
+         }
+
+         return -1;
+      }
+
+      switch (c)
+      {
+         case ' ':
+         case '\t':
+            break;
+
+         case ',':
+            i = 0;
+            option[i] = '\n';
+            /* We parsed a new option and there is a least another. */
+            (void)
+               relabsd_axis_enable_option_from_name(option, axis_name, axis);
+
+            break;
+
+         case '\n':
+            option[i] = '\n';
+            (void)
+               relabsd_axis_enable_option_from_name(option, axis_name, axis);
+
+            return 1;
+
+         case EOF:
+            option[i] = '\n';
+            (void)
+               relabsd_axis_enable_option_from_name(option, axis_name, axis);
+
+            return 0;
+
+         default:
+            option[i] = c;
+            i++;
+
+            break;
+      }
+   }
+
+   RELABSD_FATAL
+   (
+      "[CONFIG] Option name '%s[...]' (axis '%s') is too long (%d chars max).",
+      option,
+      axis_name,
+      RELABSD_OPTION_MAX_SIZE
+   );
+
+   return -1;
+}
+
+/*
+static int parse_timeout_option
+(
+   struct relabsd_config * const conf,
+   const char * const param
+)
+{
+   int timeout_msec;
+   const int prev_errno = errno;
+
+   conf->enable_timeout = 1;
+
+   errno = 0;
+
+   timeout_msec = atoi(param);
+
+   if (timeout_msec <= 0)
+   {
+      RELABSD_FATAL
+      (
+         "Illegal value for timeout \"%d\": accepted range is [1, %d].",
+         timeout_msec,
+         INT_MAX
+      );
+
+      return -1;
+   }
+
+   memset((void *) &(conf->timeout), 0, sizeof(struct timeval));
+
+   conf->timeout.tv_sec = (time_t) (timeout_msec / 1000);
+
+   conf->timeout.tv_usec =
+      (
+         ((suseconds_t) timeout_msec)
+         * ((suseconds_t) 1000)
+      );
+
+   return 0;
+}
+*/
+
+/*
+ * Returns -1 on (fatal) error,
+ *          0 on succes.
+ */
+static int parse_axis_configuration_line
+(
+   FILE file [const restrict static 1],
+   const char axis_name [const restrict static 1],
+   struct relabsd_parameters parameters [const static 1]
+)
+{
+   int read_count;
+   enum relabsd_axis_name axis_index;
+   struct relabsd_axis * axis;
+
+   axis_index = relabsd_axis_parse_name(axis_name);
+
+   if (axis_index == RELABSD_UNKNOWN)
+   {
+      RELABSD_FATAL("Unknown axis '%s' in the configuration file.", axis_name);
+
+      return -1;
+
+   }
+
+   axis = (parameters->axes + axis_index);
+
+   errno = 0;
+
+   read_count =
+      fscanf
+      (
+         file,
+         "%d%d%d%d%d",
+         &(axis->min),
+         &(axis->max),
+         &(axis->fuzz),
+         &(axis->flat),
+         &(axis->resolution)
+      );
+
+   if (read_count == EOF)
+   {
+      if (errno == 0)
+      {
+         RELABSD_FATAL
+         (
+            "Unexpected end of file while reading the '%s' axis' parameters in"
+            " the configuration file.",
+            axis_name
+         );
+      }
+      else
+      {
+         RELABSD_FATAL
+         (
+            "An error occured while reading the '%s' axis' parameters in the"
+            " configuration file: %s.",
+            axis_name,
+            strerror(errno)
+         );
+      }
+
+      return -1;
+   }
+   else if (read_count < 5)
+   {
+      RELABSD_FATAL
+      (
+         "Invalid parameter count for the '%s' axis in the configuration file.",
+         axis_name
+      );
+
+      return -1;
+   }
+
+   relabsd_axis_enable(axis);
+
+   return read_axis_options(file, axis_name, axis);
+}
+
+/*
+ * Returns -1 on (fatal) error,
+ *          0 on EOF,
+ *          1 on newline.
+ */
+static int read_config_line
+(
+   FILE file [const restrict static 1],
+   const char prefix [const restrict static 1],
+   struct relabsd_parameters parameters [const restrict static 1]
+)
+{
+   if (RELABSD_IS_PREFIX("#", prefix))
+   {
+      return relabsd_util_reach_next_line_or_eof(file);
+   }
+
+   return parse_axis_configuration_line(file, prefix, parameters);
+}
+
+/******************************************************************************/
+/**** EXPORTED FUNCTIONS ******************************************************/
+/******************************************************************************/
+int relabsd_parameters_parse_config_file
+(
+   const char filename [const restrict static 1],
+   struct relabsd_parameters parameters [const restrict static 1]
+)
+{
+   FILE * file;
+   char buffer[(RELABSD_CONF_AXIS_CODE_SIZE + 1)];
+   int continue_reading;
+
+   buffer[RELABSD_CONF_AXIS_CODE_SIZE] = '\0';
+
+   errno = 0;
+   file = fopen(filename, "r");
+
+   if (file == (FILE *) NULL)
+   {
+      RELABSD_FATAL("Could not open file %s: %s.", filename, strerror(errno));
+
+      return -1;
+   }
+
+   errno = 0;
+   continue_reading = 1;
+
+   while
+   (
+      (continue_reading == 1)
+      &&
+      (
+         fscanf
+         (
+            file,
+            "%" RELABSD_TO_STRING(RELABSD_CONF_AXIS_CODE_SIZE) "s",
+            buffer
+         )
+         != EOF
+      )
+   )
+   {
+      switch (read_config_line(file, buffer, parameters))
+      {
+         case 1:
+            /* Everything is going well. */
+            break;
+
+         case 0:
+            /* EOF reached. */
+            continue_reading = 0;
+            break;
+
+         case -1:
+            /* A fatal error occured. */
+            fclose(file);
+            return -1;
+      }
+   }
+
+   if (errno != 0)
+   {
+      /* An error happened in the while loop condition. */
+      RELABSD_FATAL
+      (
+         "[CONFIG] Error while reading file: %s, last read '%s'.",
+         strerror(errno),
+         buffer
+      );
+
+      fclose(file);
+
+      return -1;
+   }
+
+   fclose(file);
+
+   return 0;
+}