Changeset 808 for trunk/ithildin/lib/conf.c

Timestamp:

06/05/07 10:46:00 (5 years ago)

Author:

wd

Message:

Another milestone. Builds, starts without errors.. then doesn't take
connections, buy hey.

Also made the config file finder a bit smarter about looking for config
files.

File:

• trunk/ithildin/lib/conf.c (modified) (9 diffs)

trunk/ithildin/lib/conf.c

@@ -15 +15 @@
 
 /* these are parsing functions */
-static char *conf_preparse(char *, char *);
-static conf_list_t *conf_parse(char *, int, char *);
+static char *conf_preparse(const char *, char *);
+static conf_list_t *conf_parse(const char *, int, char *);
 static conf_entry_t *merge_into_conf(conf_list_t *, conf_entry_t *,
         conf_list_t *);
 static char *conf_expand_text(char *);
+static const char *included_from = NULL;
 
 #define parse_err(x) log_error("%s:%d %s", file, line, x);
@@ -26 +27 @@
  * tree headed at the conf_list structure it returns.  The rest of the
  * functions in this file can then be used to look at this data.  */
-conf_list_t *read_conf(char *file) {
+conf_list_t *read_conf(const char *file) {
     char *stuff = NULL;
     conf_list_t *list = NULL;
+    char *fname = NULL;
+
+    /* Look for the file.  If it is not an absolute path search first in the
+     * same directory as the file it is being included from (if any) and
+     * then relative to our configured path for config files. */
+    if (is_absolute_path(file))
+        fname = strdup(file);
+    else {
+        fname = malloc(PATH_MAX);
+        *fname = '\0';
+        if (included_from != NULL) {
+            snprintf(fname, PATH_MAX, "%s/%s", dirname(included_from), file);
+            if (access(fname, R_OK) && errno == ENOENT)
+                *fname = '\0';
+        }
+        if (*fname == '\0')
+            snprintf(fname, PATH_MAX, "%s/%s", me.conf_path, file);
+        if (access(fname, R_OK)) {
+            if (errno != ENOENT)
+                log_error("Could not access file %s (%s)", fname,
+                        strerror(errno));
+            else
+                log_error("Could not find config file %s", fname);
+            free(fname);
+            return NULL;
+        }
+    }
 
     /* mmap the data in */
-    if ((stuff = mmap_file(file)) == NULL)
+    if ((stuff = mmap_file(fname)) == NULL) {
+        log_error("Could not open config file %s", file);
+        free(fname);
         return NULL;
+    }
 
     /* weed out comments, and bad strings */
-    if ((stuff = conf_preparse(file, stuff)) == NULL)
+    if ((stuff = conf_preparse(fname, stuff)) == NULL) {
+        free(fname);
         return NULL;
+    }
     
     /* now parse */
-    list = conf_parse(file, 1, stuff);
+    list = conf_parse(fname, 1, stuff);
     /* 'stuff' is now not necessary one way or the other */
     free(stuff);
-
-    if (list == NULL)
-        return NULL;
-
-    /* display_tree(0, list);*/
+    free(fname);
+
     return list;
 }
@@ -69 +99 @@
 
 /* this is a debugging function whicb prints the data in 'list' out in a
- * tree-like format to stdout. */
+ *  * tree-like format to stdout. */
 void conf_display_tree(int depth, conf_list_t *list) {
     int i;
@@ -81 +111 @@
                     ep->string);
         else {
-            printf("%s->[%s]\n", (depth ? "\b" : ""), ep->name);
+            printf("%s->[%s]\n", (depth ?  "\b" : ""), ep->name);
             conf_display_tree(depth + 1, ep->list);
         }
@@ -237 +267 @@
  * and handles reading in included files.  It also does light sanity-checking
  * to make sure comments and strings are properly terminated. */
-static char *conf_preparse(char *file, char *oldstr) {
+static char *conf_preparse(const char *file, char *oldstr) {
     char *s = oldstr;
     char *newstr = malloc(strlen(oldstr) + 1);
@@ -344 +374 @@
 /* do the final parsing of the data, extract name/value pairs and build our
  * tree, and all with a spot of recursion.  yum! */
-static conf_list_t *conf_parse(char *file, int line, char *str) {
+static conf_list_t *conf_parse(const char *file, int line, char *str) {
     conf_list_t *list = malloc(sizeof(conf_list_t));
     conf_entry_t *ent = NULL, *last = NULL;
@@ -351 +381 @@
     int startline = 0;
 
-#define swallow_whitespace() do {                                        \
-    while (*str) {                                                        \
-        if (*str == '\n')                                                \
-            line++;                                                        \
-        if (isspace(*str))                                                \
-            str++;                                                        \
-        else                                                                \
-            break;                                                        \
-    }                                                                        \
+#define swallow_whitespace() do {                                             \
+    while (*str) {                                                            \
+        if (*str == '\n')                                                     \
+            line++;                                                           \
+        if (isspace(*str))                                                    \
+            str++;                                                            \
+        else                                                                  \
+            break;                                                            \
+    }                                                                         \
 } while (0)
 
@@ -469 +499 @@
                 conf_list_t *inclist;
 
+                included_from = file;
                 if ((inclist = read_conf(ent->string)) == NULL) {
                     parse_err("error in included file:");
@@ -479 +510 @@
                     last = merge_into_conf(list, last, inclist);
                 }
+                included_from = NULL;
             } else {
                 if (last == NULL)