Fixes for Cygwin (see ChangeLog)

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 95a3214118ca1ff3c6246cae42cbc2b11ad6bc88..99aa31e1a969c9600fdda5feeee222d7e9962c49 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,4 +1,5 @@
 /* $Id$ */
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -9,7 +10,9 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include <syslog.h>
 #include <dlfcn.h>
 #include "citadel.h"
@@ -105,11 +108,6 @@ void cleanup_stuff(void *arg)
 
        syslog(LOG_NOTICE,"session %d ended", CC->cs_pid);
        
-       /* Deallocate any unsent express messages */
-       begin_critical_section(S_SESSION_TABLE);
-       if (CC->ExpressMessages != NULL) phree(CC->ExpressMessages);
-       end_critical_section(S_SESSION_TABLE);
-
        /* Deallocate any message list we might have in memory */
        if (CC->msglist != NULL) phree(CC->msglist);
 
@@ -231,7 +229,7 @@ void cmd_uchg(char *newusername)
  * space otherwise.
  */
 char check_express(void) {
-       if (CC->ExpressMessages == NULL) {
+       if (CC->FirstExpressMessage == NULL) {
                return(' ');
                }
        else {
@@ -685,7 +683,7 @@ void *context_loop(struct CitContext *con)
        CC->download_fp = NULL;
        CC->upload_fp = NULL;
        CC->cs_pid = con->client_socket;        /* not necessarily portable */
-       CC->ExpressMessages = NULL;
+       CC->FirstExpressMessage = NULL;
        CC->msglist = NULL;
        CC->num_msgs = 0;
        time(&CC->lastcmd);
@@ -838,6 +836,10 @@ void *context_loop(struct CitContext *con)
                        cmd_msg4(&cmdbuf[5]);
                        }
 
+               else if (!strncasecmp(cmdbuf,"OPNA",4)) {
+                       cmd_opna(&cmdbuf[5]);
+                       }
+
                else if (!strncasecmp(cmdbuf,"INFO",4)) {
                        cmd_info();
                        }