Rewrite of libconf to be clean. SMMAN BROKEN AT THIS COMMIT!

6 files changed, 341 insertions, 63 deletions

diff --git a/configure.ac b/configure.ac
index 688c0d6..e34fd21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ doc/Makefile
 ])
 
 build_libs=
-LIBS_REQUIRES="eina ecore"
+LIBS_REQUIRES="eina ecore eio"
 PKG_CHECK_MODULES(LIBS, [$LIBS_REQUIRES], [build_libs=yes], [build_libs=no])
 
 build_smman=
diff --git a/src/include/Conf.h b/src/include/Conf.h
index d26a4a2..e6f68fe 100644
--- a/src/include/Conf.h
+++ b/src/include/Conf.h
@@ -1,66 +1,16 @@
-/*
- * Copyright © 2013 Guillaume Friloux <kuri@efl.so>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * @file libconf.h
- * @brief Contains structs and prototypes of libconf
- * @author Guillaume Friloux <kuri@efl.so>
- * @version 1.0
- *
- * Contains structs and prototypes of libconf
- *
- */
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
+#ifndef CONF_H
+#define CONF_H
 #include <Eina.h>
+#include <Ecore.h>
+#include <Eio.h>
 
-#ifndef LIBCONFVARS
-#define LIBCONFVARS
-/**
- * \struct libconfig
- * \brief Main structure
- */
-struct libconfig
-{
-        char file[512];                         /**< Name of config file */
-        Eina_List *lconfig;                     /**< List of variables */
-};
+typedef struct _Conf Conf;
 
-/**
- * \struct libconfig_entry
- * \brief Structure containing information about one config entry
- */
-struct libconfig_entry
-{
-        char *var,                                      /**< Variable name */
-             *value;                            /**< Value for this variable */
-};
+typedef void (*Conf_Done_Cb)(void *data, Conf *conf);
+typedef void (*Conf_Error_Cb)(void *data, Conf *conf, const char *errstr);
 
-int ligconfig_einadom;                  /**< Eina DOM to use for eina logs */
+Eina_Hash * conf_variables_get(Conf *conf);
+Eina_Bool conf_load(char *file, Conf_Done_Cb done_cb, Conf_Error_Cb error_cb, const void *data);
+int conf_init(void);
+int conf_shutdown(void);
 #endif
-
-int libconfig_init(char *file, struct libconfig *myconf);
-int libconfig_load(struct libconfig *myconf);
-int libconfig_list(struct libconfig *myconf, int (*callback_function)(char *variable, char *value));
-int libconfig_free(struct libconfig *myconf);
-void libconfig_version(char *version);
diff --git a/src/lib/Makefile.mk b/src/lib/Makefile.mk
index 88771bb..67784be 100644
--- a/src/lib/Makefile.mk
+++ b/src/lib/Makefile.mk
@@ -5,7 +5,9 @@ src/lib/libconf.la \
 src/lib/libspy.la
 
 src_lib_libconf_la_SOURCES = \
-src/lib/conf.c \
+src/lib/conf/conf_main.c \
+src/lib/conf/conf_load.c \
+src/lib/conf/conf_private.h \
 src/include/Conf.h
 src_lib_libconf_la_CFLAGS = $(LIBS_CFLAGS) $(EXTRA_CPPFLAGS)
 src_lib_libconf_la_LDFLAGS = $(LIBS_CFLAGS)
diff --git a/src/lib/conf/conf_load.c b/src/lib/conf/conf_load.c
new file mode 100644
index 0000000..f41c1e7
--- /dev/null
+++ b/src/lib/conf/conf_load.c
@@ -0,0 +1,133 @@
+#include "conf_private.h"
+
+void
+conf_load_line_free(void *data)
+{
+   free(data);
+}
+
+void
+conf_load_line_parse(Conf *conf,
+                     char *line)
+{
+   char **split,
+         *variable,
+         *value;
+   Eina_Strbuf *buf;
+
+   DBG("conf[%p] line[%s]", conf, line);
+
+   if (line[0] == '#')
+     return;
+
+   split = eina_str_split(line, "=", 2);
+   if (!split)
+     {
+        ERR("Failed to alloc 2D array");
+        return;
+     }
+
+   if ((!split[0]) || (!split[1]))
+     {
+        ERR("Failed to split line correctly");
+        return;
+     }
+
+   buf = eina_strbuf_new();
+   if (!buf)
+     {
+        ERR("Failed to allocate string buffer");
+        return;
+     }
+
+   eina_strbuf_append(buf, split[0]);
+   eina_strbuf_trim(buf);
+   variable = eina_strbuf_string_steal(buf);
+
+   eina_strbuf_append(buf, split[1]);
+   eina_strbuf_trim(buf);
+   value = eina_strbuf_string_steal(buf);
+
+   eina_hash_add(conf->variables, variable, strdup(value));
+
+   free(variable);
+   free(value);
+   eina_strbuf_free(buf);
+}
+
+Eina_Bool
+conf_load_map_filter(void *data,
+                     Eio_File *handler EINA_UNUSED,
+                     void *map,
+                     size_t length)
+{
+   Conf_Load *cl;
+   Conf *conf;
+   const char *s,
+              *p1;
+   char *line;
+
+   cl = data;
+   conf = cl->conf;
+   s = map;
+
+   while (1)
+     {
+        if ((size_t)(s-(const char *)map) == length)
+          break;
+
+        p1 = strchr(s, '\n');
+        if (!p1)
+          goto end_loop;
+
+        if (p1 == s)
+          goto end_loop;
+
+        line = strndup(s, p1 -s);
+        if (line[p1-s-1] == '\r')
+          line[p1-s-1] = 0;
+
+        conf_load_line_parse(conf, line);
+
+        free((char *)line);
+
+        s = p1;
+
+        end_loop:
+        s++;
+     }
+
+   return EINA_TRUE;
+}
+
+void
+conf_load_map_main(void *data,
+                   Eio_File *handler EINA_UNUSED,
+                   void *map EINA_UNUSED,
+                   size_t length EINA_UNUSED)
+{
+   Conf_Load *cl;
+
+   cl = data;
+   DBG("cl[%p]", cl);
+
+   cl->cb.done((void *)cl->cb.data, cl->conf);
+   conf_free(cl->conf);
+   free(cl);
+}
+
+void
+conf_load_map_error(void *data,
+                    Eio_File *handler EINA_UNUSED,
+                    int error)
+{
+   Conf_Load *cl;
+
+   cl = data;
+   ERR("Error while mmaping file %s : %s", cl->conf->file, strerror(error));
+
+   cl->cb.error((void *)cl->cb.data, cl->conf,
+                "Error while mmaping file");
+   conf_free(cl->conf);
+   free(cl);
+}
diff --git a/src/lib/conf/conf_main.c b/src/lib/conf/conf_main.c
new file mode 100644
index 0000000..154995f
--- /dev/null
+++ b/src/lib/conf/conf_main.c
@@ -0,0 +1,155 @@
+#include "conf_private.h"
+
+static int _conf_init_count = 0;
+int _conf_log_dom_global = -1;
+
+Eina_Hash *
+conf_variables_get(Conf *conf)
+{
+   return conf->variables;
+}
+
+void
+conf_free(Conf *conf)
+{
+   EINA_SAFETY_ON_NULL_RETURN(conf);
+
+   if (conf->ef)
+     {
+        eina_file_close(conf->ef);
+        conf->ef = NULL;
+     }
+
+   if (conf->file)
+     {
+        free((char *)conf->file);
+        conf->file = NULL;
+     }
+
+   free(conf);
+}
+
+Eina_Bool
+conf_load(char *file,
+          Conf_Done_Cb done_cb,
+          Conf_Error_Cb error_cb,
+          const void *data)
+{
+   Conf *conf;
+   Conf_Load *cl;
+
+   conf = calloc(1, sizeof(Conf));
+   if (!conf)
+     {
+        ERR("Failed to allocate Conf structure");
+        return EINA_FALSE;
+     }
+
+   conf->ef = eina_file_open(file, EINA_FALSE);
+   if (!conf->ef)
+     {
+        ERR("Failed to open file %s : %s", file, strerror(errno));
+        goto free_conf;
+     }
+
+   conf->file = strdup(file);
+   if (!conf->file)
+     {
+        ERR("Failed to allocate buffer");
+        goto close_file;
+     }
+
+   cl = calloc(1, sizeof(Conf_Load));
+   if (!cl)
+     {
+        ERR("Failed to allocate Conf_Load structure");
+        goto free_file;
+     }
+
+   cl->cb.done = done_cb;
+   cl->cb.error = error_cb;
+   cl->cb.data = data;
+   cl->conf = conf;
+
+   conf->variables = eina_hash_string_superfast_new(conf_load_line_free);
+
+   eio_file_map_all(conf->ef,
+                    EINA_FILE_SEQUENTIAL,
+                    conf_load_map_filter,
+                    conf_load_map_main,
+                    conf_load_map_error,
+                    cl);
+
+   return EINA_TRUE;
+
+free_file:
+   free((char *)conf->file);
+close_file:
+   eina_file_close(conf->ef);
+   conf->ef = NULL;
+free_conf:
+   free(conf);
+   return EINA_FALSE;
+}
+
+int conf_init(void)
+{
+   if (++_conf_init_count != 1)
+     return _conf_init_count;
+
+   if (!eina_init())
+     {
+        fprintf(stderr, "Conf can not initialize Eina\n");
+        return --_conf_init_count;
+     }
+
+   _conf_log_dom_global = eina_log_domain_register("conf", EINA_COLOR_RED);
+   if (_conf_log_dom_global < 0)
+     {
+        EINA_LOG_ERR("Conf can not create a general log domain");
+        goto shutdown_eina;
+     }
+
+   if (!ecore_init())
+     {
+        ERR("Can not initialize Ecore");
+        goto unregister_log_domain;
+     }
+
+   if (!eio_init())
+     {
+        ERR("Can not initialize Conf");
+        goto shutdown_ecore;
+     }
+
+   eina_log_threads_enable();
+   return _conf_init_count;
+
+shutdown_ecore:
+   ecore_shutdown();
+unregister_log_domain:
+   eina_log_domain_unregister(_conf_log_dom_global);
+   _conf_log_dom_global = -1;
+shutdown_eina:
+   eina_shutdown();
+   return --_conf_init_count;
+}
+
+int
+conf_shutdown(void)
+{
+   if (_conf_init_count <= 0)
+     {
+        fprintf(stderr, "Conf init count not greater than 0 in shutdown.");
+        return 0;
+     }
+
+   if (--_conf_init_count != 0)
+     return _conf_init_count;
+
+   ecore_shutdown();
+   eina_log_domain_unregister(_conf_log_dom_global);
+   _conf_log_dom_global = -1;
+   eina_shutdown();
+   return _conf_init_count;
+}
diff --git a/src/lib/conf/conf_private.h b/src/lib/conf/conf_private.h
new file mode 100644
index 0000000..693f36e
--- /dev/null
+++ b/src/lib/conf/conf_private.h
@@ -0,0 +1,38 @@
+#include <Conf.h>
+
+extern int _conf_log_dom_global;
+
+#define ERR(...) EINA_LOG_DOM_ERR(_conf_log_dom_global, __VA_ARGS__)
+#define DBG(...) EINA_LOG_DOM_DBG(_conf_log_dom_global, __VA_ARGS__)
+#define NFO(...) EINA_LOG_DOM_INFO(_conf_log_dom_global, __VA_ARGS__)
+#define WRN(...) EINA_LOG_DOM_WARN(_conf_log_dom_global, __VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_conf_log_dom_global, __VA_ARGS__)
+
+struct _Conf
+{
+   const char *file;
+   Eina_File *ef;
+
+   Eina_Hash *variables;
+};
+
+
+typedef struct _Conf_Load
+{
+   Conf *conf;
+
+   struct
+   {
+      Conf_Done_Cb done;
+      Conf_Error_Cb error;
+      const void *data;
+   } cb;
+} Conf_Load;
+
+void conf_free(Conf *conf);
+
+Eina_Bool conf_load_map_filter(void *data, Eio_File *handler, void *map, size_t length);
+void conf_load_map_main(void *data, Eio_File *handler, void *map, size_t length);
+void conf_load_map_error(void *data, Eio_File *handler, int error);
+
+void conf_load_line_free(void *data);