Smman can now load its conf file and fake loading of rules.

Next step is to compile regexes and find log files to watch.

6 files changed, 49 insertions, 28 deletions

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 169a3ff..6ab1a81 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -7,8 +7,10 @@ src/bin/smman
 src_bin_smman_SOURCES = \
 src/bin/main.c \
 src/bin/config.c \
+src/bin/filter.c \
 src/bin/smman.h
 src_bin_smman_CPPFLAGS = @BIN_CFLAGS@ $(EXTRA_CPPFLAGS)
 src_bin_smman_LDFLAGS = @BIN_LIBS@
 src_bin_smman_LDADD = \
-src/lib/libconf.la
+src/lib/libconf.la \
+src/lib/librules.la
diff --git a/src/bin/filter.c b/src/bin/filter.c
index f5095ed..83d51ac 100644
--- a/src/bin/filter.c
+++ b/src/bin/filter.c
@@ -5,16 +5,26 @@ filter_load(void *data,
             Rules *rules,
             Rule *rule)
 {
+   Smman *smman;
 
+   smman = data;
+   if (smman->rules != rules)
+     return;
 
+   DBG("smman[%p] rules[%p] rule[%p][%s]", smman, rules, rule, rule->name);
 }
 
 void
 filter_load_done(void *data,
                  Rules *rules)
 {
+   Smman *smman;
 
+   smman = data;
+   if (smman->rules != rules)
+     return;
 
+   DBG("smman[%p] rules[%p]", smman, rules);
 }
 
 
diff --git a/src/bin/smman.h b/src/bin/smman.h
index 62a273d..a532b86 100644
--- a/src/bin/smman.h
+++ b/src/bin/smman.h
@@ -7,6 +7,7 @@
 #include <Ecore_Getopt.h>
 #include <Eio.h>
 #include <Conf.h>
+#include <Rules.h>
 
 int smman_log_dom_global;
 
@@ -27,6 +28,9 @@ typedef struct _Smman
 #define WRN(...) EINA_LOG_DOM_WARN(smman_log_dom_global, __VA_ARGS__)
 #define CRI(...) EINA_LOG_DOM_CRIT(smman_log_dom_global, __VA_ARGS__)
 
-
 void config_done(void *data, Conf *conf);
 void config_error(void *data, Conf *conf, const char *errstr);
+
+void filter_load(void *data, Rules *rules, Rule *rule);
+void filter_load_done(void *data, Rules *rules);
+void filter_load_error(void *data, Rules *rules, const char *errstr);
diff --git a/src/include/Rules.h b/src/include/Rules.h
index 6bd964d..0c6fad9 100644
--- a/src/include/Rules.h
+++ b/src/include/Rules.h
@@ -5,9 +5,38 @@
 #include <Eio.h>
 #include <Conf.h>
 
+#include <sys/types.h>
+#include <regex.h>
+
 typedef struct _Rules Rules;
 typedef struct _Rule Rule;
 
+struct _Rule
+{
+   EINA_INLIST;
+   const char *name;
+
+   struct
+   {
+      const char *filename,
+                 *type,
+                 *source_host,
+                 *source_path,
+                 *tags;
+      Eina_Bool todel;
+      Eina_Inlist *regex;
+   } spec;
+};
+
+typedef struct _Rule_Regex
+{
+   EINA_INLIST;
+   const char *regex;
+   Eina_Bool must_match;
+   regex_t preg;
+} Rule_Regex;
+
+
 typedef void (*Rules_Progress_Cb)(void *data, Rules *rules, Rule *rule);
 typedef void (*Rules_Done_Cb)(void *data, Rules *rules);
 typedef void (*Rules_Error_Cb)(void *data, Rules *rules, const char *errstr);
@@ -16,5 +45,6 @@ int rules_init(void);
 int rules_shutdown(void);
 
 Rules * rules_new(const char *directory);
+Eina_Bool rules_load(Rules *rules, Rules_Progress_Cb progress_cb, Rules_Done_Cb done_cb, Rules_Error_Cb error_cb, void *data);
 
 #endif
diff --git a/src/lib/rules/rules_main.c b/src/lib/rules/rules_main.c
index eb19723..3ea4746 100644
--- a/src/lib/rules/rules_main.c
+++ b/src/lib/rules/rules_main.c
@@ -10,6 +10,7 @@ rules_new(const char *directory)
 
    rules = calloc(1, sizeof(Rules));
    rules->directory = strdup(directory);
+   return rules;
 }
 
 Eina_Bool
diff --git a/src/lib/rules/rules_private.h b/src/lib/rules/rules_private.h
index c4a370f..1d74d95 100644
--- a/src/lib/rules/rules_private.h
+++ b/src/lib/rules/rules_private.h
@@ -1,6 +1,4 @@
 #include <Rules.h>
-#include <sys/types.h>
-#include <regex.h>
 
 extern int _rules_log_dom_global;
 
@@ -16,30 +14,6 @@ struct _Rules
    Eina_Inlist *rules;
 };
 
-struct _Rule
-{
-   EINA_INLIST;
-   const char *name;
-
-   struct
-   {
-      const char *filename,
-                 *type,
-                 *source_host,
-                 *source_path,
-                 *tags;
-      Eina_Bool todel;
-      Eina_Inlist *regex;
-   } spec;
-};
-
-typedef struct _Rule_Regex
-{
-   const char *regex;
-   Eina_Bool must_match;
-   regex_t preg;
-} Rule_Regex;
-
 typedef struct _Rules_Load
 {
    Rules *rules;