#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>
#include "routines2.h"
#include "tools.h"
#include "rooms.h"
+#include "client_chat.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
int rc_exp_beep;
-char rc_exp_cmd[256];
+char rc_exp_cmd[1024];
int rc_allow_attachments;
int rc_display_message_numbers;
int rc_force_mail_prompts;
int rc_remember_passwords;
int rc_ansi_color;
int num_urls = 0;
-char urls[MAXURLS][256];
-char rc_url_cmd[256];
+char urls[MAXURLS][SIZ];
+char rc_url_cmd[SIZ];
char *gl_string;
int next_lazy_cmd = 5;
int lines_printed = 0; /* line count for paginator */
extern int screenwidth, screenheight;
+extern int termn8;
struct citcmd *cmdlist = NULL;
tv.tv_usec = 0;
retval = select(1, &rfds, NULL, NULL, &tv);
+ /* Careful! Disable keepalives during keyboard polling; we're probably
+ * in the middle of a data transfer from the server, in which case
+ * sending a NOOP would throw the client protocol out of sync.
+ */
if (FD_ISSET(0, &rfds)) {
+ set_keepalives(KA_NO);
the_character = inkey();
+ set_keepalives(KA_YES);
}
else {
the_character = 0;
hit_any_key();
set_keepalives(KA_YES);
return(0);
- }
- return(lp);
}
+ return(lp);
+}
*/
void print_express(void)
{
- char buf[256];
+ char buf[1024];
FILE *outpipe;
+ time_t timestamp;
+ struct tm *stamp;
+ int flags = 0;
+ char sender[64];
+ char node[64];
if (express_msgs == 0)
return;
- express_msgs = 0;
- serv_puts("PEXP");
- serv_gets(buf);
- if (buf[0] != '1')
- return;
- if (strlen(rc_exp_cmd) > 0) {
- outpipe = popen(rc_exp_cmd, "w");
- if (outpipe != NULL) {
- while (serv_gets(buf), strcmp(buf, "000")) {
- fprintf(outpipe, "%s\n", buf);
- }
- pclose(outpipe);
- return;
- }
- }
- /* fall back to built-in express message display */
if (rc_exp_beep) {
putc(7, stdout);
}
- color(BRIGHT_RED);
- printf("\r---\n");
- while (serv_gets(buf), strcmp(buf, "000")) {
- printf("%s\n", buf);
+ if (strlen(rc_exp_cmd) == 0) {
+ color(BRIGHT_RED);
+ printf("\r---");
}
- printf("---\n");
+
+ while (express_msgs != 0) {
+ serv_puts("GEXP");
+ serv_gets(buf);
+ if (buf[0] != '1')
+ return;
+
+ express_msgs = extract_int(&buf[4], 0);
+ timestamp = extract_long(&buf[4], 1);
+ flags = extract_int(&buf[4], 2);
+ extract(sender, &buf[4], 3);
+ extract(node, &buf[4], 4);
+ strcpy(last_paged, sender);
+
+ stamp = localtime(×tamp);
+
+ /* If the page is a Logoff Request, honor it. */
+ if (flags & 2) {
+ termn8 = 1;
+ return;
+ }
+
+ if (strlen(rc_exp_cmd) > 0) {
+ outpipe = popen(rc_exp_cmd, "w");
+ if (outpipe != NULL) {
+ /* Header derived from flags */
+ if (flags & 2)
+ fprintf(outpipe,
+ "Please log off now, as requested ");
+ else if (flags & 1)
+ fprintf(outpipe, "Broadcast message ");
+ else if (flags & 4)
+ fprintf(outpipe, "Chat request ");
+ else
+ fprintf(outpipe, "Message ");
+ /* Timestamp. Can this be improved? */
+ if (stamp->tm_hour == 0 || stamp->tm_hour == 12)
+ fprintf(outpipe, "at 12:%02d%cm",
+ stamp->tm_min,
+ stamp->tm_hour ? 'p' : 'a');
+ else if (stamp->tm_hour > 12) /* pm */
+ fprintf(outpipe, "at %d:%02dpm",
+ stamp->tm_hour - 12,
+ stamp->tm_min);
+ else /* am */
+ fprintf(outpipe, "at %d:%02dam",
+ stamp->tm_hour, stamp->tm_min);
+ fprintf(outpipe, " from %s", sender);
+ if (strncmp(serv_info.serv_nodename, node, 32))
+ fprintf(outpipe, " @%s", node);
+ fprintf(outpipe, ":\n");
+ while (serv_gets(buf), strcmp(buf, "000")) {
+ fprintf(outpipe, "%s\n", buf);
+ }
+ pclose(outpipe);
+ if (express_msgs == 0)
+ return;
+ continue;
+ }
+ }
+ /* fall back to built-in express message display */
+ printf("\n");
+
+ /* Header derived from flags */
+ if (flags & 2)
+ printf("Please log off now, as requested ");
+ else if (flags & 1)
+ printf("Broadcast message ");
+ else if (flags & 4)
+ printf("Chat request ");
+ else
+ printf("Message ");
+
+ /* Timestamp. Can this be improved? */
+ if (stamp->tm_hour == 0 || stamp->tm_hour == 12)/* 12am/12pm */
+ printf("at 12:%02d%cm", stamp->tm_min,
+ stamp->tm_hour ? 'p' : 'a');
+ else if (stamp->tm_hour > 12) /* pm */
+ printf("at %d:%02dpm",
+ stamp->tm_hour - 12, stamp->tm_min);
+ else /* am */
+ printf("at %d:%02dam", stamp->tm_hour, stamp->tm_min);
+
+ /* Sender */
+ printf(" from %s", sender);
+
+ /* Remote node, if any */
+ if (strncmp(serv_info.serv_nodename, node, 32))
+ printf(" @%s", node);
+
+ printf(":\n");
+
+ while (serv_gets(buf), strcmp(buf, "000")) {
+ printf("%s", buf);
+ }
+ }
+ printf("\n---\n");
color(BRIGHT_WHITE);
+
+
}
static time_t idlet = 0;
static void really_do_keepalive(void) {
- char buf[256];
+ char buf[1024];
time(&idlet);
- if (keepalives_enabled != KA_NO) {
+ if (keepalives_enabled == KA_YES) {
serv_puts("NOOP");
- if (keepalives_enabled == KA_YES) {
- serv_gets(buf);
- if (buf[3] == '*') {
- express_msgs = 1;
- if (ok_to_interrupt == 1) {
- printf("\r%64s\r", "");
- print_express();
- printf("%s%c ", room_name,
- room_prompt(room_flags));
- fflush(stdout);
- }
+ serv_gets(buf);
+ if (buf[3] == '*') {
+ express_msgs = 1;
+ if (ok_to_interrupt == 1) {
+ printf("\r%64s\r", "");
+ print_express();
+ printf("%s%c ", room_name,
+ room_prompt(room_flags));
+ fflush(stdout);
}
}
}
void load_command_set(void)
{
FILE *ccfile;
- char buf[256];
+ char buf[1024];
struct citcmd *cptr;
struct citcmd *lastcmd = NULL;
int a, d;
perror("commands: cannot open citadel.rc");
logoff(errno);
}
- while (fgets(buf, 256, ccfile) != NULL) {
+ while (fgets(buf, sizeof buf, ccfile) != NULL) {
while ((strlen(buf) > 0) ? (isspace(buf[strlen(buf) - 1])) : 0)
buf[strlen(buf) - 1] = 0;
{
int a;
static char exp[64];
- char buf[256];
+ char buf[1024];
strcpy(exp, strbuf);
live.c_cc[VINTR] = (-1);
live.c_cc[VQUIT] = (-1);
+#ifdef hpux
+ live.c_cc[VMIN] = 0;
+ live.c_cc[VTIME] = 0;
+#endif
+
/* do we even need this stuff anymore? */
/* live.c_line=0; */
live.c_cc[VERASE] = 8;
if ( (!strncasecmp(buffer, "http://", 7))
|| (!strncasecmp(buffer, "ftp://", 6)) ) {
- safestrncpy(urls[num_urls], buffer, 255);
+ safestrncpy(urls[num_urls], buffer, (SIZ-1));
for (a=0; a<strlen(urls[num_urls]); ++a) {
b = urls[num_urls][a];
if ( (b==' ') || (b==')') || (b=='>') || (b==10)
int i, c, a;
int choices;
int do_prompt = 0;
- char buf[256];
+ char buf[1024];
int ch;
int display_prompt = 1;