NETCFG: make basic parsing

[citadel.git] / citadel / scripts / mk_module_init.sh

diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh
index 2d0dc3c03ce6753f808fbb10e194f5ca3dd46131..bbf19b783819daeb10807659c2b6babc1806ce1b 100755 (executable)
--- a/citadel/scripts/mk_module_init.sh
+++ b/citadel/scripts/mk_module_init.sh
@@ -74,14 +74,15 @@ cat <<EOF  >$U_FILE
 #include "citadel.h"
 #include "modules_init.h"
 #include "sysdep_decls.h"
-
+#include "serv_extensions.h"
 
 
 
 void upgrade_modules (void)
 {
+    const char *pMod;
 
-    CtdlLogPrintf (CTDL_INFO, "Upgrade modules.\n");
+    MODM_syslog(LOG_INFO, "Upgrade modules.\n");
 
 EOF
 
@@ -105,30 +106,44 @@ cat <<EOF  >$C_FILE
 #include "citadel.h"
 #include "modules_init.h"
 #include "sysdep_decls.h"
+#include "serv_extensions.h"
 
 
 void LogPrintMessages(long err);
 extern long DetailErrorFlags;
 
-
-
 void initialise_modules (int threading)
 {
     long filter;
-    nSizErrmsg = 0;
-
-    if (threading)
-        CtdlLogPrintf (CTDL_INFO, "Initialise modules, CtdlThreads enabled.\n");
-    else
-        CtdlLogPrintf (CTDL_INFO, "Initialise modules, CtdlThreads not yet enabled.\n");
+    const char *pMod;
+
+    if (threading) {
+        MODM_syslog(LOG_DEBUG, "Initializing, CtdlThreads enabled.\n");
+    }
+    else {
+        MODM_syslog(LOG_INFO, "Initializing. CtdlThreads not yet enabled.\n");
+    }
 /* static server initialization: */
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(citserver));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(control));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(euidindex));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(file_ops));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(msgbase));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(room_ops));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(user_ops));
+        pMod = CTDL_INIT_CALL(citserver);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+
+        pMod = CTDL_INIT_CALL(control);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+
+        pMod = CTDL_INIT_CALL(euidindex);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+
+        pMod = CTDL_INIT_CALL(file_ops);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+
+        pMod = CTDL_INIT_CALL(msgbase);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+
+        pMod = CTDL_INIT_CALL(room_ops);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+
+        pMod = CTDL_INIT_CALL(user_ops);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
 /* dynamic modules: */
 
 EOF
@@ -156,6 +171,7 @@ void upgrade_modules(void);
        CTDL_MODULE_INIT(msgbase);
        CTDL_MODULE_INIT(room_ops);
        CTDL_MODULE_INIT(user_ops);
+       CTDL_MODULE_INIT(netconfig);
 EOF
 
 for i in serv_*.c
@@ -165,7 +181,8 @@ do
                RES_OUT=`echo $RES | cut -b2-`
                /usr/bin/printf "Found entry point in file $i\n"
 cat <<EOF  >> $C_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL($RES_OUT));
+       pMod = CTDL_INIT_CALL($RES_OUT);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
 
 EOF
 cat <<EOF >>$H_FILE
@@ -177,7 +194,8 @@ EOF
                RES_OUT=`echo $RES | cut -b2-`
                /usr/bin/printf "Found upgrade point in file $i\n"
 cat <<EOF  >> $U_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_UPGRADE_CALL($RES_OUT));
+       pMod = CTDL_UPGRADE_CALL($RES_OUT);
+        MOD_syslog(LOG_INFO, "%s\n", pMod);
 
 EOF
 cat <<EOF >>$H_FILE
@@ -215,7 +233,8 @@ EOF
                                                /usr/bin/printf "Found entry point in file modules/$j/$k\n"
 # Add this entry point to the .c file
 cat <<EOF >> $C_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL($RES_OUT));
+       pMod = CTDL_INIT_CALL($RES_OUT);
+       MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
 EOF
 # Add this entry point to the .h file
 cat <<EOF >> $H_FILE
@@ -228,7 +247,8 @@ EOF
                                                /usr/bin/printf "Found upgrade point in file modules/$j/$k\n"
 # Add this entry point to the .c file
 cat <<EOF >> $U_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_UPGRADE_CALL($RES_OUT));
+       pMod = CTDL_UPGRADE_CALL($RES_OUT);
+       MOD_syslog(LOG_INFO, "%s\n", pMod);
 EOF
 # Add this entry point to the .h file
 cat <<EOF >> $H_FILE
@@ -271,7 +291,8 @@ EOF
                                                RES_OUT=`echo $RES | cut -b2-`
                                                /usr/bin/printf "Found entry point in file user_modules/$j/$k\n"
 cat <<EOF >> $C_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL($RES_OUT));
+       pMod = CTDL_INIT_CALL($RES_OUT);
+       MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
 EOF
 cat <<EOF >> $H_FILE
 CTDL_MODULE_INIT($RES_OUT);
@@ -282,7 +303,8 @@ EOF
                                                RES_OUT=`echo $RES | cut -b2-`
                                                /usr/bin/printf "Found upgrade point in file user_modules/$j/$k\n"
 cat <<EOF >> $U_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_UPGRADE_CALL($RES_OUT));
+       pMod = CTDL_UPGRADE_CALL($RES_OUT);
+       MOD_syslog(LOG_INFO, "%s\n", pMod);
 EOF
 cat <<EOF >> $H_FILE
 CTDL_MODULE_UPGRADE($RES_OUT);
@@ -297,6 +319,11 @@ fi
 
 cd $CUR_DIR
 
+# this one has to be called last, else it will not find all hooks registered.
+cat <<EOF >> $C_FILE
+        pMod = CTDL_INIT_CALL(netconfig);
+        MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+EOF
 /usr/bin/printf "\n\n" >> $C_FILE
 /usr/bin/printf "\tfor (filter = 1; filter != 0; filter = filter << 1)\n" >> $C_FILE
 /usr/bin/printf "\t\tif ((filter & DetailErrorFlags) != 0)\n" >> $C_FILE