fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index 50cc2fe0b7d4b7addb6f9355b7c0539f38f5a16e..f10b1aa213a4119b653503c1b509fbe93e1ecb33 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -14,7 +14,17 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/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
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
@@ -41,6 +51,7 @@
 #include "routines2.h"
 #include "tools.h"
 #include "rooms.h"
+#include "client_chat.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
@@ -63,8 +74,8 @@ int rc_force_mail_prompts;
 int rc_remember_passwords;
 int rc_ansi_color;
 int num_urls = 0;
-char urls[MAXURLS][1024];
-char rc_url_cmd[1024];
+char urls[MAXURLS][SIZ];
+char rc_url_cmd[SIZ];
 
 char *gl_string;
 int next_lazy_cmd = 5;
@@ -213,6 +224,7 @@ void print_express(void)
                flags = extract_int(&buf[4], 2);
                extract(sender, &buf[4], 3);
                extract(node, &buf[4], 4);
+               strcpy(last_paged, sender);
        
                stamp = localtime(&timestamp);