Changeset 808 for trunk/ithildin/lib/module.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/module.c (modified) (3 diffs)

trunk/ithildin/lib/module.c

@@ -70 +70 @@
     bool new = false;
     char *s = NULL;
+    char *dname = NULL;
 
     if (cep->type == CONF_TYPE_LIST) {
@@ -97 +98 @@
     if (clp != NULL) {
         if ((s = conf_find_entry("config", clp, 1)) != NULL) {
-            /* try to access their config file as specified, if it does not
-             * come with a path prefix, we try prepending the conf
-             * directory, then with the full pathname make sure we can load
-             * the conf.  if we can't we won't load the module */
-            m->conffile = malloc(PATH_MAX);
-            if (*s != 's') /* XXX: this will suck come windows support time */
-                snprintf(m->conffile, PATH_MAX, "%s/%s", me.conf_path, s);
-            else
-                strlcpy(m->conffile, s, PATH_MAX);
-
-        }
-
-        if ((s = conf_find_entry("load", clp, 1)) != NULL &&
-                str_conv_bool(s, false))
-            m->flags |= MODULE_FL_AUTOLOAD;
-        else
+            /* Let the config code sort out the correct path.. */
+            m->conffile = strdup(s);
+        }
+
+        if ((s = conf_find_entry("load", clp, 1)) != NULL) {
+            if (str_conv_bool(s, false))
+                m->flags |= MODULE_FL_AUTOLOAD;
+        } else
             m->flags |= MODULE_FL_AUTOLOAD; /* default is to load. */
         
@@ -128 +121 @@
         /* let's also take a stab at guessing their module config file name.
          * We try two things: $confdir/modulename.conf and
-         * $confdir/modulename/modulename.conf.  If neither works we do not
-         * make any further efforts.  We determine the usability of these
-         * files through the access() call. */
+         * $confdir/modulename/modulename.conf.  For modules with '.'s in
+         * their name we replace the '.'s with path separators and try that
+         * way, using the last portion of the module's name as the name of
+         * the config file. */
+        s = dname = strdup(m->name);
+        while (*s != '\0') {
+            if (*s == '.')
+                *s = '/';
+            s++;
+        }
+
         s = malloc(PATH_MAX);
-        snprintf(s, PATH_MAX, "%s/%s.conf", me.conf_path, m->name);
+        /* first try the path without the additional directory layer */
+        snprintf(s, PATH_MAX, "%s/%s.conf", me.conf_path, dname);
         if (access(s, R_OK) == 0)
             m->conffile = s;
         else {
-            /* don't try the directory method if the module name already
-             * contains slashes (indicating it is subdirectory-ized already) */
-            if (!strchr(s, '/')) {
-                snprintf(s, PATH_MAX, "%s/%s/%s.conf", me.conf_path, m->name,
-                        m->name);
-                if (access(s, R_OK) == 0)
-                    m->conffile = s;
-            }
-        }
+            /* Now try the subdirectory method, this is a little weird since
+             * we need to get just the last component of the module's name
+             * (if it has dots in it) */
+            snprintf(s, PATH_MAX, "%s/%s/%s.conf", me.conf_path, dname,
+                    (strchr(m->name, '.') ? strrchr(m->name, '.') + 1 :
+                     m->name));
+            if (access(s, R_OK) == 0)
+                m->conffile = s;
+        }
+        free(dname);
+        if (m->conffile == NULL)
+            free(s);
     }