Parser: recode / independant from wmfs code / @include works, closes #21

src/CMakeLists.txt

@@ -4,6 +4,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/parse)
 
 SET(WMFS_SOURCES
 	parse/parse.c
+	parse/api.c
 	barwin.c
 	client.c
 	config.c
@@ -31,4 +32,4 @@ add_executable(${PROJECT_NAME} ${WMFS_SOURCES})
 target_link_libraries(${PROJECT_NAME} ${CMAKE_LINK_LIBRARIES})
 INSTALL ( TARGETS ${PROJECT_NAME}
 	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib${LIB_SUFFIX} )
+	LIBRARY DESTINATION lib${LIB_SUFFIX} )

src/parse/api.c

@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2010 Philippe Pepiot <phil@philpep.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define _BSD_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <err.h>
+
+#include "parse.h"
+
+extern TAILQ_HEAD(, conf_sec) config;
+
+static const struct opt_type opt_type_null = { 0, 0, False, NULL };
+
+static struct opt_type
+string_to_opt(char *s)
+{
+     struct opt_type ret = opt_type_null;
+
+     if (!s || !strlen(s))
+          return ret;
+
+     ret.num = strtol(s, (char**)NULL, 10);
+     ret.fnum = strtod(s, NULL);
+
+     if (!strcmp(s, "true") || !strcmp(s, "True") ||
+               !strcmp(s, "TRUE") || !strcmp(s, "1"))
+          ret.bool = True;
+     else
+          ret.bool = False;
+
+     ret.str = s;
+
+     return ret;
+}
+
+
+void
+print_unused(struct conf_sec *sec)
+{
+     struct conf_sec *s;
+     struct conf_opt *o;
+
+     if (!sec)
+     {
+          TAILQ_FOREACH(s, &config, entry)
+               print_unused(s);
+          return;
+     }
+
+     SLIST_FOREACH(o, &sec->optlist, entry)
+          if (o->used == False)
+               warnx("%s:%d, unused param %s",
+                         o->filename, o->line, o->name);
+
+     TAILQ_FOREACH(s, &sec->sub, entry)
+          if (!TAILQ_EMPTY(&s->sub))
+               print_unused(s);
+}
+
+void
+free_conf(struct conf_sec *sec)
+{
+     struct conf_sec *s;
+     struct conf_opt *o;
+     size_t n;
+
+     if (!sec)
+     {
+          TAILQ_FOREACH(s, &config, entry)
+          {
+               free(s->name);
+               free_conf(s);
+               free(s);
+          }
+          return;
+     }
+
+     while (!SLIST_EMPTY(&sec->optlist))
+     {
+          o = SLIST_FIRST(&sec->optlist);
+          SLIST_REMOVE_HEAD(&sec->optlist, entry);
+          free(o->name);
+
+          for (n = 0; o->val[n]; n++)
+               free(o->val[n]);
+
+          free(o);
+     }
+
+     while (!TAILQ_EMPTY(&sec->sub))
+     {
+          s = TAILQ_FIRST(&sec->sub);
+          TAILQ_REMOVE(&sec->sub, s, entry);
+          free_conf(s);
+     }
+
+}
+
+struct conf_sec **
+fetch_section(struct conf_sec *s, char *name)
+{
+     struct conf_sec **ret;
+     struct conf_sec *sec;
+     size_t i = 0;
+
+     if (!name)
+          return NULL;
+
+     if (!s) {
+          ret = xcalloc(2, sizeof(struct conf_sec *));
+          TAILQ_FOREACH(sec, &config, entry)
+               if (!strcmp(sec->name, name)) {
+                    ret[0] = sec;
+                    ret[1] = NULL;
+                    break;
+               }
+     }
+     else {
+          ret = xcalloc(s->nsub+1, sizeof(struct conf_sec *));
+          TAILQ_FOREACH(sec, &s->sub, entry) {
+               if (!strcmp(sec->name, name) && i < s->nsub)
+                    ret[i++] = sec;
+          }
+          ret[i] = NULL;
+     }
+     return ret;
+}
+
+struct conf_sec *
+fetch_section_first(struct conf_sec *s, char *name)
+{
+     struct conf_sec *sec, *ret = NULL;
+
+     if (!name)
+          return NULL;
+
+     if (!s)
+     {
+          TAILQ_FOREACH(sec, &config, entry)
+               if(sec->name && !strcmp(sec->name, name)) {
+                   ret = sec;
+                   break;
+               }
+     }
+     else
+     {
+         TAILQ_FOREACH(sec, &s->sub, entry)
+              if (sec->name && !strcmp(sec->name, name)) {
+                  ret = sec;
+                  break;
+              }
+     }
+
+     return ret;
+}
+
+size_t
+fetch_section_count(struct conf_sec **s)
+{
+     size_t ret;
+     for (ret = 0; s[ret]; ret++);
+     return ret;
+}
+
+struct opt_type *
+fetch_opt(struct conf_sec *s, char *dfl, char *name)
+{
+     struct conf_opt *o;
+     struct opt_type *ret;
+     size_t i = 0;
+
+     if (!name)
+          return NULL;
+
+     ret = xcalloc(10, sizeof(struct opt_type));
+
+     if (s) {
+          SLIST_FOREACH(o, &s->optlist, entry)
+               if (!strcmp(o->name, name)) {
+                    while (o->val[i]) {
+                         o->used = True;
+                         ret[i] = string_to_opt(o->val[i]);
+                         i++;
+                    }
+                    ret[i] = opt_type_null;
+                    return ret;
+               }
+     }
+
+     ret[0] = string_to_opt(dfl);
+     ret[1] = opt_type_null;
+
+     return ret;
+}
+
+struct opt_type
+fetch_opt_first(struct conf_sec *s, char *dfl, char *name)
+{
+     struct conf_opt *o;
+
+     if (!name)
+          return opt_type_null;
+     else if (s)
+          SLIST_FOREACH(o, &s->optlist, entry)
+               if (!strcmp(o->name, name)) {
+                    o->used = True;
+                    return string_to_opt(o->val[0]);
+               }
+     return string_to_opt(dfl);
+}
+
+size_t
+fetch_opt_count(struct opt_type *o)
+{
+     size_t ret;
+     for(ret = 0; o[ret].str; ret++);
+     return ret;
+}
+
+

src/parse/parse.h

@@ -19,12 +19,20 @@
 
 #include <sys/queue.h>
 
+#define INCLUDE_CMD "@include"
+
+#define False 0
+#define True 1
+
+#define bool_t int
+
 struct conf_opt {
      char *name;
      char *val[10];
      size_t nval;
-     Bool used;
+     bool_t used;
      int line;
+     char *filename;
      SLIST_ENTRY(conf_opt) entry;
 };
 
@@ -40,17 +48,10 @@ struct conf_sec {
 struct opt_type {
      long int num;
      float fnum;
-     Bool bool;
+     bool_t bool;
      char *str;
 };
 
-/*
- * Load all text from file
- * return new char* on succes - needs to use free() to delete
- * return NULL on failure
- */
-char * load_file(const char *name);
-
 /*
  * Create config from file
  * return -1 on failure
@@ -114,4 +115,8 @@ struct opt_type *fetch_opt(struct conf_sec *, char *, char *);
  */
 size_t fetch_opt_count(struct opt_type *);
 
+
+/* wrapper for calloc */
+void *xcalloc(size_t, size_t);
+
 #endif /* PARSE_H */