* compatibility with Berkeley DB < 3.3

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 03473dd970531db0c1632987b207574d067fc8ec..17d62ce4c7bf06e5b71df82a9c559df094702590 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -14,31 +14,42 @@
 #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"
 #include "room_ops.h"
 
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
 struct ChatLine *ChatQueue = NULL;
 int ChatLastMsg = 0;
 
-extern struct CitContext *ContextList;
 
 
 
@@ -63,7 +74,8 @@ void allwrite(char *cmdbuf, int flag, char *username)
        }
        if ((strcasecmp(cmdbuf, "NOOP")) && (flag != 2)) {
                fp = fopen(CHATLOG, "a");
-               fprintf(fp, "%s\n", bcast);
+               if (fp != NULL)
+                       fprintf(fp, "%s\n", bcast);
                fclose(fp);
        }
        clnew = (struct ChatLine *) mallok(sizeof(struct ChatLine));
@@ -254,7 +266,7 @@ void cmd_chat(char *argbuf)
 
                retval = client_read_to(&cmdbuf[linelen], 1, 2);
 
-               if (retval < 0) {       /* socket broken? */
+               if (retval < 0 || CC->kill_me) {        /* socket broken? */
                        if ((CC->cs_flags & CS_STEALTH) == 0) {
                                allwrite("<disconnected>", 0, NULL);
                        }
@@ -323,7 +335,7 @@ void cmd_chat(char *argbuf)
                                                if (strcasecmp(CC->curr_user, t_context->curr_user))
                                                        allwrite(strptr1, 2, t_context->curr_user);
                                        } else
-                                               cprintf(":|User not found.\n", cmdbuf);
+                                               cprintf(":|User not found.\n");
                                        cprintf("\n");
                                }
                                if ((cmdbuf[0] != '/') && (strlen(cmdbuf) > 0)) {
@@ -436,7 +448,7 @@ void cmd_gexp(char *argbuf) {
        cprintf("%d %d|%ld|%d|%s|%s\n",
                LISTING_FOLLOWS,
                ((ptr->next != NULL) ? 1 : 0),          /* more msgs? */
-               ptr->timestamp,                         /* time sent */
+               (long)ptr->timestamp,                           /* time sent */
                ptr->flags,                             /* flags */
                ptr->sender,                            /* sender of msg */
                config.c_nodename);                     /* static for now */
@@ -506,7 +518,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) {
@@ -547,6 +558,7 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                                                malloc(sizeof(struct savelist));
                                        sptr->next = sl;
                                        MailboxName(sptr->roomname,
+                                                   sizeof sptr->roomname,
                                                &ccptr->usersupp, PAGELOGROOM);
                                        sl = sptr;
                                }
@@ -574,9 +586,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 = CtdlSubmitMsg(logmsg, NULL, PAGELOGROOM);
 
                /* Now save a copy in the global log room, if configured */
                if (strlen(config.c_logpages) > 0) {
@@ -666,9 +677,9 @@ void cmd_sexp(char *argbuf)
 
                if (message_sent > 0) {
                        if (strlen(x_msg) > 0)
-                               cprintf("%d Message sent", OK);
+                               cprintf("%d Message sent", CIT_OK);
                        else
-                               cprintf("%d Ok to send message", OK);
+                               cprintf("%d Ok to send message", CIT_OK);
                        if (message_sent > 1)
                                cprintf(" to %d users", message_sent);
                        cprintf(".\n");
@@ -700,7 +711,7 @@ void cmd_dexp(char *argbuf)
        if ((new_state == 0) || (new_state == 1)) {
                CC->disable_exp = new_state;
                }
-       cprintf("%d %d\n", OK, CC->disable_exp);
+       cprintf("%d %d\n", CIT_OK, CC->disable_exp);
        }
 
 
@@ -736,7 +747,7 @@ void cmd_reqt(char *argbuf) {
                }
        }
        end_critical_section(S_SESSION_TABLE);
-       cprintf("%d Sent termination request to %d sessions.\n", OK, sessions);
+       cprintf("%d Sent termination request to %d sessions.\n", CIT_OK, sessions);
 }