* Added function CtdlGetDynamicSymbol() for dynamic symbol allocation

[citadel.git] / citadel / sysdep.c

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 18e66b9f3c1cfb6b94cd703d93323701f41c1adf..43d6355735da7eef6cf45e1b5bb3eff5a473d522 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -155,14 +155,13 @@ void dump_tracked() {
        }
 #endif
 
+static pthread_t main_thread_id;
+
 #ifndef HAVE_PTHREAD_CANCEL
 /*
  * signal handler to fake thread cancellation; only required on BSDI as far
  * as I know.
  */
-
-static pthread_t main_thread_id;
-
 static RETSIGTYPE cancel_thread(int signum) {
        pthread_exit(NULL);
        }
@@ -213,8 +212,8 @@ void init_sysdep(void) {
        signal(SIGHUP, signal_cleanup);
        signal(SIGTERM, signal_cleanup);
        signal(SIGPIPE, SIG_IGN);
-#ifndef HAVE_PTHREAD_CANCEL /* fake it - only BSDI afaik */
        main_thread_id = pthread_self();
+#ifndef HAVE_PTHREAD_CANCEL /* fake it - only BSDI afaik */
        signal(SIGUSR1, cancel_thread);
 #endif
        }
@@ -233,18 +232,22 @@ void begin_critical_section(int which_one)
 
        /* lprintf(8, "begin_critical_section(%d)\n", which_one); */
 
+       if (!pthread_equal(pthread_self(), main_thread_id)) {
+               /* Keep a count of how many critical sections this thread has
+                * open, so that end_critical_section() doesn't enable
+                * cancellation prematurely. */
+               CC->n_crit++;
 #ifdef HAVE_PTHREAD_CANCEL
-       /* Don't get interrupted during the critical section */
-       pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldval);
+               /* Don't get interrupted during the critical section */
+               pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldval);
 #else
-       /* We're faking cancellation with signals. Block SIGUSR1 while we're in
-        * the critical section. */
-       if (!pthread_equal(pthread_self(), main_thread_id)) {
+               /* We're faking cancellation with signals. Block SIGUSR1 while
+                * we're in the critical section. */
                sigemptyset(&set);
                sigaddset(&set, SIGUSR1);
                pthread_sigmask(SIG_BLOCK, &set, NULL);
-               }
 #endif
+               }
 
        /* Obtain a semaphore */
        pthread_mutex_lock(&Critters[which_one]);
@@ -267,22 +270,23 @@ void end_critical_section(int which_one)
        /* Let go of the semaphore */
        pthread_mutex_unlock(&Critters[which_one]);
 
+       if (!pthread_equal(pthread_self(), main_thread_id))
+       if (!--CC->n_crit) {
 #ifdef HAVE_PTHREAD_CANCEL
-       /* If a cancel was sent during the critical section, do it now.
-        * Then re-enable thread cancellation.
-        */
-       pthread_testcancel();
-       pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldval);
-       pthread_testcancel();
+               /* If a cancel was sent during the critical section, do it now.
+                * Then re-enable thread cancellation.
+                */
+               pthread_testcancel();
+               pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldval);
+               pthread_testcancel();
 #else
-       /* We're faking it. Unblock SIGUSR1; signals sent during the critical
-        * section should now be able to kill us. */
-       if (!pthread_equal(pthread_self(), main_thread_id)) {
+               /* We're faking it. Unblock SIGUSR1; signals sent during the
+                * critical section should now be able to kill us. */
                sigemptyset(&set);
                sigaddset(&set, SIGUSR1);
                pthread_sigmask(SIG_UNBLOCK, &set, NULL);
-               }
 #endif
+               }
 
        }
 
@@ -637,6 +641,14 @@ void kill_session(int session_to_kill) {
                pthread_cancel(killme);
 #else
                pthread_kill(killme, SIGUSR1);
+#ifdef __FreeBSD__
+               /* there's a very stupid bug in the user threads package on
+                  FreeBSD 3.1 which prevents a signal from being properly
+                  dispatched to a thread that's in a blocking syscall. the
+                  first signal interrupts the syscall, the second one actually
+                  gets delivered. */
+               pthread_kill(killme, SIGUSR1);
+#endif
 #endif
                }
        }
@@ -776,11 +788,11 @@ int main(int argc, char **argv)
        struct CitContext *con;         /* Temporary context pointer */
        char tracefile[128];            /* Name of file to log traces to */
        int a, i;                       /* General-purpose variables */
-       char convbuf[128];
        fd_set readfds;
        struct timeval tv;
        struct passwd *pw;
        int drop_root_perms = 1;
+       char *moddir;
         
        /* specify default port name and trace file */
        strcpy(tracefile, "");
@@ -804,13 +816,12 @@ int main(int argc, char **argv)
 
                /* -x specifies the desired logging level */
                else if (!strncmp(argv[a], "-x", 2)) {
-                       strcpy(convbuf, argv[a]);
-                       verbosity = atoi(&convbuf[2]);
+                       verbosity = atoi(&argv[a][2]);
                        }
 
                else if (!strncmp(argv[a], "-h", 2)) {
-                       strcpy(convbuf, argv[a]);
-                       strcpy(bbs_home_directory, &convbuf[2]);
+                       safestrncpy(bbs_home_directory, &argv[a][2],
+                                   sizeof bbs_home_directory);
                        home_specified = 1;
                        }
 
@@ -831,9 +842,13 @@ int main(int argc, char **argv)
                }
 
        /* Tell 'em who's in da house */
-       lprintf(1, "Multithreaded message server for %s\n", CITADEL);
-       lprintf(1, "Copyright (C) 1987-1999 by Art Cancro.  ");
-       lprintf(1, "All rights reserved.\n\n");
+       lprintf(1,
+"\nMultithreaded message server for Citadel/UX\n"
+"Copyright (C) 1987-1999 by the Citadel/UX development team.\n"
+"Citadel/UX is free software, covered by the GNU General Public License, and\n"
+"you are welcome to change it and/or distribute copies of it under certain\n"
+"conditions.  There is absolutely no warranty for this software.  Please\n"
+"read the 'COPYING.txt' file for details.\n\n");
 
        /* Initialize... */
        init_sysdep();
@@ -861,9 +876,7 @@ int main(int argc, char **argv)
                                   "Group IDs will be incorrect.\n", BBSUID,
                                strerror(errno));
                else {
-                       if (initgroups(pw->pw_name, pw->pw_gid))
-                               lprintf(3, "initgroups(): %s\n",
-                                       strerror(errno));
+                       initgroups(pw->pw_name, pw->pw_gid);
                        if (setgid(pw->pw_gid))
                                lprintf(3, "setgid(%d): %s\n", pw->pw_gid,
                                        strerror(errno));
@@ -875,7 +888,11 @@ int main(int argc, char **argv)
                }
 
        lprintf(7, "Initializing loadable modules\n");
-       DLoader_Init("./modules");
+       if ((moddir = malloc(strlen(bbs_home_directory) + 9)) != NULL) {
+               sprintf(moddir, "%s/modules", bbs_home_directory);
+               DLoader_Init(moddir);
+               free(moddir);
+               }
        lprintf(9, "Modules done initializing.\n");
 
        /*