- port to Cygwin (DLL support, etc.)

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 4be79b1f1351eafeae5e06dae6e2fc478540d091..afe54a979099c22e2206c67a8146dd72a5b7033e 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -14,22 +14,30 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
 #endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
+#include "dynloader.h"
 #include <syslog.h>
 #include "serv_chat.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
 #include "tools.h"
 #include "msgbase.h"
 #include "user_ops.h"
@@ -38,7 +46,6 @@
 struct ChatLine *ChatQueue = NULL;
 int ChatLastMsg = 0;
 
-extern struct CitContext *ContextList;
 
 
 
@@ -506,7 +513,6 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        struct savelist *sl = NULL;     /* list of rooms to save this page */
        struct savelist *sptr;
        struct CtdlMessage *logmsg;
-       char roomname[ROOMNAMELEN];
        long msgnum;
 
        if (strlen(x_msg) > 0) {
@@ -574,9 +580,8 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                /* Save a copy of the message in the sender's log room,
                 * creating the room if necessary.
                 */
-               MailboxName(roomname, &CC->usersupp, PAGELOGROOM);
-               create_room(roomname, 4, "", 0, 1);
-               msgnum = CtdlSaveMsg(logmsg, "", roomname, MES_LOCAL);
+               create_room(PAGELOGROOM, 4, "", 0, 1);
+               msgnum = CtdlSaveMsg(logmsg, "", PAGELOGROOM, MES_LOCAL);
 
                /* Now save a copy in the global log room, if configured */
                if (strlen(config.c_logpages) > 0) {
@@ -613,7 +618,6 @@ void cmd_sexp(char *argbuf)
        char x_msg[SIZ];
        char *lun;              /* <bc> */
        char *x_big_msgbuf = NULL;
-    char *ix_msg;
 
        if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
                cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
@@ -650,13 +654,13 @@ void cmd_sexp(char *argbuf)
                        SEND_LISTING, message_sent);
                x_big_msgbuf = mallok(SIZ);
                memset(x_big_msgbuf, 0, SIZ);
-               while (client_gets(&ix_msg), strcmp(ix_msg, "000")) {
+               while (client_gets(x_msg), strcmp(x_msg, "000")) {
                        x_big_msgbuf = reallok(x_big_msgbuf,
-                              strlen(x_big_msgbuf) + strlen(ix_msg) + 4);
+                              strlen(x_big_msgbuf) + strlen(x_msg) + 4);
                        if (strlen(x_big_msgbuf) > 0)
                           if (x_big_msgbuf[strlen(x_big_msgbuf)] != '\n')
                                strcat(x_big_msgbuf, "\n");
-                       strcat(x_big_msgbuf, ix_msg);
+                       strcat(x_big_msgbuf, x_msg);
                }
                PerformXmsgHooks(lun, x_user, x_big_msgbuf);
                phree(x_big_msgbuf);