Corrections in reg_pick

src/config.c

@@ -4,6 +4,8 @@
 #include <lektor/config.h>
 #include <lektor/database.h>
 #include <lektor/net.h>
+#include <lektor/reg.h>
+
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
@@ -121,23 +123,13 @@ load_so(const char *const mod_path, const char *const mod_init, void *mod, struc
        Uppon successfull completion, the function shall return 0, and return
        a non zero value if something bad happened. */
     int (*module_set_function)(void *const, struct lkt_state *, void *const);
-    char *error;
-    void *handle = dlopen(mod_path, RTLD_NOW);
-
-    if (NULL == handle) {
-        LOG_ERROR("libdl error in dlopen on file '%s': %s", mod_path, dlerror());
-        return 1;
-    }
-
-    dlerror();
-    *(void **) (&module_set_function) = dlsym(handle, mod_init);
-
-    if ((error = dlerror()) != NULL) {
-        LOG_ERROR("libdl error in dlsym on file '%s': %s\n", mod_path, error);
-        return 1;
-    }
+    void *handle = NULL;
+    *(void **) (&module_set_function) = reg_pick(mod_path, &handle, mod_init);
 
+    if (module_set_function)
         return ! module_set_function(mod, srv, handle);
+    else
+        return 1;
 }
 
 inline int

src/reg.c

@@ -12,13 +12,15 @@ struct module_reg *reg;
 void *
 reg_pick(const char *file, void **handle, const char *symbol)
 {
+    int i;
     if (!symbol)
         return NULL;
 
+    /* Use the register instead of dlfcn? */
+    if (!file || STR_MATCH(file, "STATIC") || handle == NULL)
+        goto use_reg;
+
     /* Use dlsym */
-    if (handle) {
-        if (!file)
-            return NULL;
     char *error;
     *handle = dlopen(file, RTLD_NOW);
 
@@ -28,7 +30,7 @@ reg_pick(const char *file, void **handle, const char *symbol)
     }
 
     dlerror();
-        void *sym = dlsym(handle, symbol);
+    void *sym = dlsym(*handle, symbol);
 
     if ((error = dlerror()) != NULL) {
         LOG_ERROR("libdl error in dlsym on file '%s': %s\n", file, error);
@@ -36,11 +38,9 @@ reg_pick(const char *file, void **handle, const char *symbol)
     }
 
     return sym;
-    }
 
     /* Read the reg */
-    else {
-        int i;
+use_reg:
     for (i = 0; reg[i].name && reg[i].func && !STR_MATCH(reg[i].name, symbol); ++i)
         continue;
 
@@ -49,7 +49,6 @@ reg_pick(const char *file, void **handle, const char *symbol)
     else
         return NULL;
 }
-}
 
 void
 reg_set(struct module_reg *_reg)