]> code.citadel.org Git - citadel.git/blobdiff - citadel/messages.c
removed all references to sprintf from several files (not all files yet)
[citadel.git] / citadel / messages.c
index 051f218f5db2b8406d7de4bc529544de418a8f8a..8da83b3cc64f28003a4d3caab6cd7011b68059fe 100644 (file)
@@ -1,8 +1,11 @@
 /*
+ * $Id$
+ *
  * Citadel/UX message support routines
- * see copyright.doc for copyright information
+ * see copyright.txt for copyright information
  */
 
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
 #include <signal.h>
 #include <errno.h>
+#include <limits.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include "citadel.h"
 
-#define MAXWORDBUF 256
+#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 <stdarg.h>
+#include "citadel.h"
+#include "messages.h"
+#include "commands.h"
+#include "rooms.h"
+#include "tools.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+#include "screen.h"
+
+#define MAXWORDBUF SIZ
 #define MAXMSGS 512
 
 struct cittext {
        struct cittext *next;
        char text[MAXWORDBUF];
-       };
-
-long finduser();
-char inkey();
-void sttybbs();
-int struncmp();
-int fmout();
-int haschar();
-int checkpagin();
-void getline();
-void formout();
-int yesno();
-void newprompt();
-int file_checksum();
-void color();
-void do_edit();
-
-char reply_to[512];
+};
+
+void sttybbs(int cmd);
+int haschar(char *st, int ch);
+int checkpagin(int lp, int pagin, int height);
+void getline(char *string, int lim);
+void formout(char *name);
+int yesno(void);
+void newprompt(char *prompt, char *str, int len);
+int file_checksum(char *filename);
+void do_edit(char *desc, char *read_cmd, char *check_cmd, char *write_cmd);
+
+char reply_to[SIZ];
+char reply_subject[SIZ];
 long msg_arr[MAXMSGS];
 int num_msgs;
+char rc_alt_semantics;
 extern char room_name[];
 extern unsigned room_flags;
 extern long highest_msg_read;
-extern struct serv_info serv_info;
+extern struct CtdlServInfo serv_info;
 extern char temp[];
 extern char temp2[];
 extern int screenwidth;
@@ -61,37 +82,39 @@ extern unsigned userflags;
 extern char sigcaught;
 extern char editor_path[];
 extern char printcmd[];
+extern int rc_allow_attachments;
+extern int rc_display_message_numbers;
+extern int rc_force_mail_prompts;
 
 extern int editor_pid;
 
-int lines_printed;
-
-void ka_sigcatch(void) {
-       char buf[256];
+void ka_sigcatch(int signum)
+{
+       char buf[SIZ];
        alarm(S_KEEPALIVE);
-       signal(SIGALRM, (void *)ka_sigcatch);
+       signal(SIGALRM, ka_sigcatch);
        serv_puts("NOOP");
        serv_gets(buf);
-       }
+}
 
 
 /*
  * server keep-alive version of wait() (needed for external editor)
  */
-pid_t ka_wait(pid_t *kstatus)
+pid_t ka_wait(int *kstatus)
 {
        pid_t p;
 
        alarm(S_KEEPALIVE);
-       signal(SIGALRM, (void *)ka_sigcatch);
+       signal(SIGALRM, ka_sigcatch);
        do {
                errno = 0;
                p = wait(kstatus);
-               } while (errno==EINTR);
-       signal(SIGALRM,SIG_IGN);
+       } while (errno == EINTR);
+       signal(SIGALRM, SIG_IGN);
        alarm(0);
-       return(p);
-       }
+       return (p);
+}
 
 
 /*
@@ -105,27 +128,27 @@ int ka_system(char *shc)
 
        childpid = fork();
        if (childpid < 0) {
-               color(1);
+               color(BRIGHT_RED);
                perror("Cannot fork");
-               color(7);
-               return((pid_t)childpid);
-               }
+               color(DIM_WHITE);
+               return ((pid_t) childpid);
+       }
 
        if (childpid == 0) {
-               execlp("/bin/sh","sh","-c",shc,NULL);
+               execlp("/bin/sh", "sh", "-c", shc, NULL);
                exit(127);
-               }
+       }
 
        if (childpid > 0) {
                do {
                        waitpid = ka_wait(&retcode);
-                       } while (waitpid != childpid);
-               return(retcode);
-               }
-
-       return(-1);
+               } while (waitpid != childpid);
+               return (retcode);
        }
 
+       return (-1);
+}
+
 
 
 /*
@@ -135,19 +158,20 @@ void add_newline(struct cittext *textlist)
 {
        struct cittext *ptr;
 
-       ptr=textlist;
-       while (ptr->next != NULL) ptr = ptr->next;
+       ptr = textlist;
+       while (ptr->next != NULL)
+               ptr = ptr->next;
 
-       while (ptr->text[strlen(ptr->text)-1]==32)
-               ptr->text[strlen(ptr->text)-1] = 0;
+       while (ptr->text[strlen(ptr->text) - 1] == 32)
+               ptr->text[strlen(ptr->text) - 1] = 0;
        /* strcat(ptr->text,"\n"); */
 
        ptr->next = (struct cittext *)
-               malloc(sizeof(struct cittext));
+           malloc(sizeof(struct cittext));
        ptr = ptr->next;
        ptr->next = NULL;
-       strcpy(ptr->text,"");
-       }
+       strcpy(ptr->text, "");
+}
 
 
 /*
@@ -157,177 +181,177 @@ void add_word(struct cittext *textlist, char *wordbuf)
 {
        struct cittext *ptr;
 
+       ptr = textlist;
+       while (ptr->next != NULL)
+               ptr = ptr->next;
 
-       ptr=textlist;
-       while (ptr->next != NULL) ptr = ptr->next;
-       
-       if (3+strlen(ptr->text)+strlen(wordbuf) > screenwidth) {
+       if (3 + strlen(ptr->text) + strlen(wordbuf) > screenwidth) {
                ptr->next = (struct cittext *)
-                       malloc(sizeof(struct cittext));
+                   malloc(sizeof(struct cittext));
                ptr = ptr->next;
                ptr->next = NULL;
-               strcpy(ptr->text,"");
-               }
-       
-       strcat(ptr->text,wordbuf);
-       strcat(ptr->text," ");
+               strcpy(ptr->text, "");
        }
 
+       strcat(ptr->text, wordbuf);
+       strcat(ptr->text, " ");
+}
+
 
 /*
- * begin editing of an opened file pointed to by fp, beginning at position pos.
+ * begin editing of an opened file pointed to by fp
  */
-void citedit(FILE *fp, long int base_pos)
+void citedit(FILE * fp)
 {
-       int a,prev,finished,b,last_space;
+       int a, prev, finished, b, last_space;
        int appending = 0;
        struct cittext *textlist = NULL;
        struct cittext *ptr;
        char wordbuf[MAXWORDBUF];
-       char buf[256];
-       long last_server_msg,now;
-
-       /*
-        * we're going to keep track of the last time we talked to
-        * the server, so we can periodically send keep-alive messages
-        * out so it doesn't time out.
-        */
-       time(&last_server_msg);
 
        /* first, load the text into the buffer */
-       fseek(fp,base_pos,0);
-       textlist = (struct cittext *)malloc(sizeof(struct cittext));
+       fseek(fp, 0L, 0);
+       textlist = (struct cittext *) malloc(sizeof(struct cittext));
        textlist->next = NULL;
-       strcpy(textlist->text,"");
+       strcpy(textlist->text, "");
 
-       strcpy(wordbuf,"");
+       strcpy(wordbuf, "");
        prev = (-1);
-       while (a=getc(fp), a>=0) {
+       while (a = getc(fp), a >= 0) {
                appending = 1;
-               if ((a==32)||(a==9)||(a==13)||(a==10)) {
-                       add_word(textlist,wordbuf);
-                       strcpy(wordbuf,"");
-                       if ((prev==13)||(prev==10)) {
-                               add_word(textlist,"\n");
+               if ((a == 32) || (a == 9) || (a == 13) || (a == 10)) {
+                       add_word(textlist, wordbuf);
+                       strcpy(wordbuf, "");
+                       if ((prev == 13) || (prev == 10)) {
+                               add_word(textlist, "\n");
                                add_newline(textlist);
-                               add_word(textlist,"");
-                               }
+                               add_word(textlist, "");
                        }
-               else {
-                       wordbuf[strlen(wordbuf)+1] = 0;
+               else {
+                       wordbuf[strlen(wordbuf) + 1] = 0;
                        wordbuf[strlen(wordbuf)] = a;
-                       }
-               if (strlen(wordbuf)+3 > screenwidth) {
-                       add_word(textlist,wordbuf);
-                       strcpy(wordbuf,"");
-                       }
-               prev = a;
                }
+               if (strlen(wordbuf) + 3 > screenwidth) {
+                       add_word(textlist, wordbuf);
+                       strcpy(wordbuf, "");
+               }
+               prev = a;
+       }
 
        /* get text */
        finished = 0;
        prev = (appending ? 13 : (-1));
-       strcpy(wordbuf,"");
+       strcpy(wordbuf, "");
+       async_ka_start();
        do {
-               a=inkey();
-               if (a==10) a=13;
-               if (a==9) a=32;
-               if (a==127) a=8;
-               if ((a==32)&&(prev==13)) {
-                       add_word(textlist,"\n");
+               a = inkey();
+               if (a == 10)
+                       a = 13;
+               if (a == 9)
+                       a = 32;
+               if (a == 127)
+                       a = 8;
+
+       /******* new ***********/
+               if ((a > 32) && (a < 127) && (prev == 13)) {
+                       add_word(textlist, "\n");
+                       scr_printf(" ");
+               }
+       /***********************/
+
+               if ((a == 32) && (prev == 13)) {
+                       add_word(textlist, "\n");
                        add_newline(textlist);
+               }
+
+               if (a == 8) {
+                       if (strlen(wordbuf) > 0) {
+                               wordbuf[strlen(wordbuf) - 1] = 0;
+                               scr_putc(8);
+                               scr_putc(32);
+                               scr_putc(8);
                        }
-               if (a==8) {
-                       if (strlen(wordbuf)>0) {
-                               wordbuf[strlen(wordbuf)-1] = 0;
-                               putc(8,stdout);
-                               putc(32,stdout);
-                               putc(8,stdout);
-                               }
-                       }
-               else if (a==13) {
-                       printf("\n");
-                       if (strlen(wordbuf)==0) finished = 1;
+               } else if (a == 13) {
+                       scr_printf("\n");
+                       if (strlen(wordbuf) == 0)
+                               finished = 1;
                        else {
-                               for (b=0; b<strlen(wordbuf); ++b)
-                                  if (wordbuf[b]==32) {
-                                       wordbuf[b]=0;
-                                       add_word(textlist,wordbuf);
-                                       strcpy(wordbuf,&wordbuf[b+1]);
-                                       b=0;
+                               for (b = 0; b < strlen(wordbuf); ++b)
+                                       if (wordbuf[b] == 32) {
+                                               wordbuf[b] = 0;
+                                               add_word(textlist,
+                                                        wordbuf);
+                                               strcpy(wordbuf,
+                                                      &wordbuf[b + 1]);
+                                               b = 0;
                                        }
-                               add_word(textlist,wordbuf);
-                               strcpy(wordbuf,"");
-                               }
+                               add_word(textlist, wordbuf);
+                               strcpy(wordbuf, "");
                        }
-               else {
-                       putc(a,stdout);
-                       wordbuf[strlen(wordbuf)+1] = 0;
+               else {
+                       scr_putc(a);
+                       wordbuf[strlen(wordbuf) + 1] = 0;
                        wordbuf[strlen(wordbuf)] = a;
-                       }
-               if ((strlen(wordbuf)+3) > screenwidth) {
+               }
+               if ((strlen(wordbuf) + 3) > screenwidth) {
                        last_space = (-1);
-                       for (b=0; b<strlen(wordbuf); ++b)
-                               if (wordbuf[b]==32) last_space = b;
-                       if (last_space>=0) {
-                               for (b=0; b<strlen(wordbuf); ++b)
-                                  if (wordbuf[b]==32) {
-                                       wordbuf[b]=0;
-                                       add_word(textlist,wordbuf);
-                                       strcpy(wordbuf,&wordbuf[b+1]);
-                                       b=0;
+                       for (b = 0; b < strlen(wordbuf); ++b)
+                               if (wordbuf[b] == 32)
+                                       last_space = b;
+                       if (last_space >= 0) {
+                               for (b = 0; b < strlen(wordbuf); ++b)
+                                       if (wordbuf[b] == 32) {
+                                               wordbuf[b] = 0;
+                                               add_word(textlist,
+                                                        wordbuf);
+                                               strcpy(wordbuf,
+                                                      &wordbuf[b + 1]);
+                                               b = 0;
                                        }
-                               for (b=0; b<strlen(wordbuf); ++b) {
-                                       putc(8,stdout);
-                                       putc(32,stdout);
-                                       putc(8,stdout);
-                                       }
-                               printf("\n%s",wordbuf);
-                               }
-                       else {
-                               add_word(textlist,wordbuf);
-                               strcpy(wordbuf,"");
-                               printf("\n");
+                               for (b = 0; b < strlen(wordbuf); ++b) {
+                                       scr_putc(8);
+                                       scr_putc(32);
+                                       scr_putc(8);
                                }
+                               scr_printf("\n%s", wordbuf);
+                       } else {
+                               add_word(textlist, wordbuf);
+                               strcpy(wordbuf, "");
+                               scr_printf("\n");
                        }
+               }
                prev = a;
-
-               /* this check implements the server keep-alive */
-               time(&now);
-               if ( (now - last_server_msg) > S_KEEPALIVE ) {
-                       serv_puts("NOOP");
-                       serv_gets(buf);
-                       last_server_msg = now;
-                       }
-
-               } while (finished==0);
+       } while (finished == 0);
+       async_ka_end();
 
        /* write the buffer back to disk */
-       fseek(fp,base_pos,0);
-       for (ptr=textlist; ptr!=NULL; ptr=ptr->next) {
-               fprintf(fp,"%s",ptr->text);
-               }
-       putc(10,fp);
-       putc(0,fp);
+       fseek(fp, 0L, 0);
+       for (ptr = textlist; ptr != NULL; ptr = ptr->next) {
+               fprintf(fp, "%s", ptr->text);
+       }
+       putc(10, fp);
+       fflush(fp);
+       ftruncate(fileno(fp), ftell(fp));
 
        /* and deallocate the memory we used */
-       while (textlist!=NULL) {
-               ptr=textlist->next;
+       while (textlist != NULL) {
+               ptr = textlist->next;
                free(textlist);
-               textlist=ptr;
-               }
+               textlist = ptr;
        }
+}
 
-
-int read_message(long int num, char pagin)     /* Read a message from the server */
-                               /* message number */
-               /* 0 = normal read, 1 = read with pagination, 2 = header */
+/* Read a message from the server
+ */
+int read_message(
+       long num,   /* message number */
+       char pagin, /* 0 = normal read, 1 = read with pagination, 2 = header */
+       FILE *dest) /* Destination file, NULL for screen */
 {
-       char buf[256];
-       char m_subject[256];
-       char from[256];
-       long now;
-       struct tm *tm;
+       char buf[SIZ];
+       char m_subject[SIZ];
+       char from[SIZ], node[SIZ], rfca[SIZ];
+       char now[SIZ];
        int format_type = 0;
        int fr = 0;
        int nhdr = 0;
@@ -335,133 +359,252 @@ int read_message(long int num, char pagin)      /* Read a message from the server */
        sigcaught = 0;
        sttybbs(1);
 
-       sprintf(buf,"MSG0 %ld|%d",num,(pagin==READ_HEADER ? 1 : 0));
+       snprintf(buf, sizeof buf, "MSG0 %ld|%d", num, (pagin == READ_HEADER ? 1 : 0));
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("*** msg #%ld: %s\n",num,buf);
+       if (buf[0] != '1') {
+               err_printf("*** msg #%ld: %s\n", num, buf);
                ++lines_printed;
-               lines_printed = checkpagin(lines_printed,pagin,screenheight);
+               lines_printed =
+                   checkpagin(lines_printed, pagin, screenheight);
                sttybbs(0);
-               return(0);
-               }
+               return (0);
+       }
+
+       strcpy(m_subject, "");
+       strcpy(reply_to, "nobody ... xxxxx");
+       strcpy(from, "");
+       strcpy(node, "");
+       strcpy(rfca, "");
 
-       strcpy(m_subject,"");
-       printf("\n");
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,screenheight);
-       printf(" ");
-       if (pagin == 1) color(3);
-
-       if (pagin==2) {
-               while(serv_gets(buf), strcmp(buf,"000")) {
-                       if (buf[4]=='=') {
-                               printf("%s\n",buf);
-                               ++lines_printed;
-                               lines_printed = 
-                                       checkpagin(lines_printed,
-                                               pagin,screenheight);
+       if (dest) {
+               fprintf(dest, "\n ");
+       } else {
+               scr_printf("\n");
+               ++lines_printed;
+               lines_printed = checkpagin(lines_printed, pagin, screenheight);
+               scr_printf(" ");
+       }
+       if (pagin == 1 && !dest) {
+               color(BRIGHT_CYAN);
+       }
+
+       if (pagin == 2) {
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       if (buf[4] == '=') {
+                               if (dest) {
+                                       fprintf(dest, "%s\n", buf);
+                               } else {
+                                       scr_printf("%s\n", buf);
+                                       ++lines_printed;
+                                       lines_printed =
+                                               checkpagin(lines_printed,
+                                               pagin, screenheight);
                                }
                        }
-               sttybbs(0);
-               return(0);
                }
+               sttybbs(0);
+               return (0);
+       }
 
-       strcpy(reply_to,"nobody...xxxxx");
-       while(serv_gets(buf), struncmp(buf,"text",4)) {
-               if (!struncmp(buf,"nhdr=yes",8)) nhdr=1;
-               if (!struncmp(buf,"from=",5)) {
-                       strcpy(from,&buf[5]);
+       while (serv_gets(buf), strncasecmp(buf, "text", 4)) {
+               if (!strncasecmp(buf, "nhdr=yes", 8))
+                       nhdr = 1;
+               if (!strncasecmp(buf, "from=", 5)) {
+                       strcpy(from, &buf[5]);
+               }
+               if (nhdr == 1)
+                       buf[0] = '_';
+
+               if (!strncasecmp(buf, "type=", 5))
+                       format_type = atoi(&buf[5]);
+               else if ((!strncasecmp(buf, "msgn=", 5))
+                   && (rc_display_message_numbers)) {
+                       if (dest) {
+                               fprintf(dest, "[#%s] ", &buf[5]);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("[");
+                               color(BRIGHT_WHITE);
+                               scr_printf("#%s", &buf[5]);
+                               color(DIM_WHITE);
+                               scr_printf("] ");
                        }
-               if (nhdr==1) buf[0]='_';
-               if (!struncmp(buf,"type=",5))
-                       format_type=atoi(&buf[5]);
-               if (!struncmp(buf,"from=",5)) {
-                       printf("from %s ",&buf[5]);
+               }
+               else if (!strncasecmp(buf, "from=", 5)) {
+                       if (dest) {
+                               fprintf(dest, "from %s ", &buf[5]);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("from ");
+                               color(BRIGHT_CYAN);
+                               scr_printf("%s ", &buf[5]);
                        }
-               if (!struncmp(buf,"path=",5))
-                       strcpy(reply_to,&buf[5]);
-               if (!struncmp(buf,"subj=",5))
-                       strcpy(m_subject,&buf[5]);
-               if ((!struncmp(buf,"hnod=",5)) 
-                  && (strucmp(&buf[5],serv_info.serv_humannode)))
-                       printf("(%s) ",&buf[5]);
-               if ((!struncmp(buf,"room=",5))
-                  && (strucmp(&buf[5],room_name)))
-                       printf("in %s> ",&buf[5]);
-
-               if (!struncmp(buf,"node=",5)) {
-                       if ( (room_flags&QR_NETWORK)
-                          || ((strucmp(&buf[5],serv_info.serv_nodename)
-                          &&(strucmp(&buf[5],serv_info.serv_fqdn)))))
-                               {
-                               printf("@%s ",&buf[5]);
-                               }
-                       if ((!strucmp(&buf[5],serv_info.serv_nodename))
-                          ||(!strucmp(&buf[5],serv_info.serv_fqdn)))
-                               {
-                               strcpy(reply_to,from);
-                               }
-                       else if (haschar(&buf[5],'.')==0) {
-                               sprintf(reply_to,"%s @ %s",from,&buf[5]);
+               }
+               else if (!strncasecmp(buf, "subj=", 5)) {
+                       strcpy(m_subject, &buf[5]);
+               }
+               else if (!strncasecmp(buf, "rfca=", 5)) {
+                       safestrncpy(rfca, &buf[5], sizeof(rfca) - 5);
+                       if (dest) {
+                               fprintf(dest, "<%s> ", &buf[5]);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("<");
+                               color(BRIGHT_BLUE);
+                               scr_printf("%s", &buf[5]);
+                               color(DIM_WHITE);
+                               scr_printf("> ");
+                       }
+               }
+               else if ((!strncasecmp(buf, "hnod=", 5))
+                   && (strcasecmp(&buf[5], serv_info.serv_humannode))
+                   && (strlen(rfca) == 0)) {
+                       if (dest) {
+                               fprintf(dest, "(%s) ", &buf[5]);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("(");
+                               color(BRIGHT_WHITE);
+                               scr_printf("%s", &buf[5]);
+                               color(DIM_WHITE);
+                               scr_printf(") ");
+                       }
+               }
+               else if ((!strncasecmp(buf, "room=", 5))
+                   && (strcasecmp(&buf[5], room_name))
+                   && (strlen(rfca) == 0)) {
+                       if (dest) {
+                               fprintf(dest, "in %s> ", &buf[5]);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("in ");
+                               color(BRIGHT_MAGENTA);
+                               scr_printf("%s> ", &buf[5]);
+                       }
+               }
+               else if (!strncasecmp(buf, "node=", 5)) {
+                       safestrncpy(node, &buf[5], sizeof(buf) - 5);
+                       if ((room_flags & QR_NETWORK)
+                           ||
+                           ((strcasecmp
+                             (&buf[5], serv_info.serv_nodename)
+                             &&
+                             (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
+                       {
+                               if (strlen(rfca) == 0) {
+                                       if (dest) {
+                                               fprintf(dest, "@%s ", &buf[5]);
+                                       } else {
+                                               color(DIM_WHITE);
+                                               scr_printf("@");
+                                               color(BRIGHT_YELLOW);
+                                               scr_printf("%s ", &buf[5]);
+                                       }
                                }
                        }
-
-               if (!struncmp(buf,"rcpt=",5))
-                       printf("to %s ",&buf[5]);
-               if (!struncmp(buf,"time=",5)) {
-                       now=atol(&buf[5]);
-                       tm=(struct tm *)localtime(&now);
-                       strcpy(buf,asctime(tm)); buf[strlen(buf)-1]=0;
-                       strcpy(&buf[16],&buf[19]);
-                       printf("%s ",&buf[4]);
+               }
+               else if (!strncasecmp(buf, "rcpt=", 5)) {
+                       if (dest) {
+                               fprintf(dest, "to %s ", &buf[5]);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("to ");
+                               color(BRIGHT_CYAN);
+                               scr_printf("%s ", &buf[5]);
+                       }
+               }
+               else if (!strncasecmp(buf, "time=", 5)) {
+                       fmt_date(now, atol(&buf[5]), 0);
+                       if (dest) {
+                               fprintf(dest, "%s ", now);
+                       } else {
+                               scr_printf("%s ", now);
                        }
                }
+       }
 
-       if (nhdr==1) {
+       if (nhdr == 1) {
                if (!is_room_aide) {
-                       printf(" ****");
+                       if (dest) {
+                               fprintf(dest, " ****");
+                       } else {
+                               scr_printf(" ****");
                        }
-               else {
-                       printf(" %s",from);
+               } else {
+                       if (dest) {
+                               fprintf(dest, " %s", from);
+                       } else {
+                               scr_printf(" %s", from);
                        }
                }
-       printf("\n");
-       if (pagin == 1 ) color(2);
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,screenheight);
+       }
+       if (dest) {
+               fprintf(dest, "\n");
+       } else {
+               scr_printf("\n");
+       }
 
-       if (strlen(m_subject)>0) {
-               printf("Subject: %s\n",m_subject);
+       if (strlen(rfca) > 0) {
+               strcpy(reply_to, rfca);
+       } else {
+               snprintf(reply_to, sizeof(reply_to), "%s @ %s", from,
+                        node);
+       }
+
+       if (pagin == 1 && !dest)
+               color(BRIGHT_WHITE);
+       if (!dest) {
                ++lines_printed;
-               lines_printed = checkpagin(lines_printed,pagin,screenheight);
+               lines_printed = checkpagin(lines_printed, pagin, screenheight);
+       }
+
+       strcpy(reply_subject, m_subject);
+       if (strlen(m_subject) > 0) {
+               if (dest) {
+                       fprintf(dest, "Subject: %s\n", m_subject);
+               } else {
+                       scr_printf("Subject: %s\n", m_subject);
+                       ++lines_printed;
+                       lines_printed = checkpagin(lines_printed,
+                                       pagin, screenheight);
                }
+       }
 
        if (format_type == 0) {
-               fr=fmout(screenwidth,NULL,
-                       ((pagin==1) ? 1 : 0),
-                       screenheight,(-1),1);
-               }
-       else {
-               while(serv_gets(buf), strcmp(buf,"000")) {
-                       if (sigcaught==0) {
-                               printf("%s\n",buf);
-                               lines_printed = lines_printed + 1 +
-                                       (strlen(buf)/screenwidth);
-                               lines_printed =
-                                       checkpagin(lines_printed,pagin,screenheight);
+               fr = fmout(screenwidth, NULL, dest,
+                          ((pagin == 1) ? 1 : 0), screenheight, (-1), 1);
+       } else {
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       if (sigcaught == 0) {
+                               if (dest) {
+                                       fprintf(dest, "%s\n", buf);
+                               } else {
+                               scr_printf("%s\n", buf);
+                                       lines_printed = lines_printed + 1 +
+                                           (strlen(buf) / screenwidth);
+                                       lines_printed =
+                                           checkpagin(lines_printed, pagin,
+                                                      screenheight);
                                }
                        }
-               fr = sigcaught;
                }
-       printf("\n");
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,screenheight);
+               fr = sigcaught;
+       }
+       if (dest) {
+               fprintf(dest, "\n");
+       } else {
+               scr_printf("\n");
+               /* scr_flush(); */
+               ++lines_printed;
+               lines_printed = checkpagin(lines_printed, pagin, screenheight);
+       }
 
-       if (pagin == 1) color(7);
+       if (pagin == 1 && !dest)
+               color(DIM_WHITE);
        sttybbs(0);
-       return(fr);
-       }
+       return (fr);
+}
 
 /*
  * replace string function for the built-in editor
@@ -473,230 +616,305 @@ void replace_string(char *filename, long int startpos)
        char rplc_str[128];
        FILE *fp;
        int a;
-       long rpos,wpos;
+       long rpos, wpos;
        char *ptr;
        int substitutions = 0;
        long msglen = 0L;
 
-       printf("Enter text to be replaced:\n: ");
-       getline(srch_str,128);
-       if (strlen(srch_str)==0) return;
-       
-       printf("Enter text to replace it with:\n: ");
-       getline(rplc_str,128);
+       scr_printf("Enter text to be replaced:\n: ");
+       getline(srch_str, 128);
+       if (strlen(srch_str) == 0)
+               return;
 
-       fp=fopen(filename,"r+");
-       if (fp==NULL) return;
+       scr_printf("Enter text to replace it with:\n: ");
+       getline(rplc_str, 128);
 
-       wpos=startpos;
-       fseek(fp,startpos,0);
-       strcpy(buf,"");
-       while (a=getc(fp), a>0) {
+       fp = fopen(filename, "r+");
+       if (fp == NULL)
+               return;
+
+       wpos = startpos;
+       fseek(fp, startpos, 0);
+       strcpy(buf, "");
+       while (a = getc(fp), a > 0) {
                ++msglen;
-               buf[strlen(buf)+1] = 0;
+               buf[strlen(buf) + 1] = 0;
                buf[strlen(buf)] = a;
-               if ( strlen(buf) >= strlen(srch_str) ) {
-                       ptr=&buf[strlen(buf)-strlen(srch_str)];
-                       if (!struncmp(ptr,srch_str,strlen(srch_str))) {
-                               strcpy(ptr,rplc_str);
+               if (strlen(buf) >= strlen(srch_str)) {
+                       ptr = (&buf[strlen(buf) - strlen(srch_str)]);
+                       if (!strncasecmp(ptr, srch_str, strlen(srch_str))) {
+                               strcpy(ptr, rplc_str);
                                ++substitutions;
-                               }
                        }
-               if (strlen(buf)>384) {
-                       rpos=ftell(fp);
-                       fseek(fp,wpos,0);
-                       fwrite((char *)buf,128,1,fp);
-                       strcpy(buf,&buf[128]);
+               }
+               if (strlen(buf) > 384) {
+                       rpos = ftell(fp);
+                       fseek(fp, wpos, 0);
+                       fwrite((char *) buf, 128, 1, fp);
+                       strcpy(buf, &buf[128]);
                        wpos = ftell(fp);
-                       fseek(fp,rpos,0);
-                       }
+                       fseek(fp, rpos, 0);
                }
-       fseek(fp,wpos,0);
-       if (strlen(buf)>0) fwrite((char *)buf,strlen(buf),1,fp);
-       putc(0,fp);
-       fclose(fp);
-       printf("<R>eplace made %d substitution(s).\n\n",substitutions);
        }
+       fseek(fp, wpos, 0);
+       if (strlen(buf) > 0)
+               fwrite((char *) buf, strlen(buf), 1, fp);
+       wpos = ftell(fp);
+       fclose(fp);
+       truncate(filename, wpos);
+       scr_printf("<R>eplace made %d substitution(s).\n\n", substitutions);
+}
 
-
-int make_message(char *filename, char *recipient, int anon_type, int format_type, int mode)
-                       /* temporary file name */
-                       /* NULL if it's not mail */
-                       /* see MES_ types in header file */
-                
-         
-{ 
+/*
+ * Function to begin composing a new message
+ */
+int client_make_message(char *filename,        /* temporary file name */
+               char *recipient,        /* NULL if it's not mail */
+               int anon_type,          /* see MES_ types in header file */
+               int format_type,
+               int mode,
+               char *subject)          /* buffer to store subject line */
+{
        FILE *fp;
-       int a,b,e_ex_code;
-       long now,beg;
-       char datestr[64];
+       int a, b, e_ex_code;
+       long beg;
+       char datestr[SIZ];
+       char header[SIZ];
        int cksum = 0;
 
-       if (mode==2) if (strlen(editor_path)==0) {
-               printf("*** No editor available, using built-in editor\n");
-               mode=0;
+       if (mode == 2)
+               if (strlen(editor_path) == 0) {
+                       err_printf
+                           ("*** No editor available, using built-in editor\n");
+                       mode = 0;
                }
 
-       time(&now);
-       strcpy(datestr,asctime(localtime(&now)));
-       datestr[strlen(datestr)-1] = 0;
+       fmt_date(datestr, time(NULL), 0);
+       header[0] = 0;
 
-       if (room_flags & QR_ANONONLY) {
-               printf(" ****");
-               }
+       if (room_flags & QR_ANONONLY && !recipient) {
+               snprintf(header, sizeof header, " ****");
+       }
        else {
-               printf(" %s from %s",datestr,fullname);
-               if (strlen(recipient)>0) printf(" to %s",recipient);
+               snprintf(header, sizeof header,
+                       " %s from %s", datestr, fullname);
+               if (strlen(recipient) > 0) {
+                       size_t tmp = strlen(header);
+                       snprintf(&header[tmp], sizeof header - tmp,
+                               " to %s", recipient);
                }
-       printf("\n");
+       }
+       scr_printf("%s\n", header);
+       if (subject != NULL) if (strlen(subject) > 0) {
+               scr_printf("Subject: %s\n", subject);
+       }
 
        beg = 0L;
 
-       if (mode==1) printf("(Press ctrl-d when finished)\n");
-       if (mode==0) {
-               fp=fopen(filename,"r");
-               if (fp!=NULL) {
-                       fmout(screenwidth,fp,0,screenheight,0,0);
+       if (mode == 1) {
+               scr_printf("(Press ctrl-d when finished)\n");
+       }
+
+       if (mode == 0) {
+               fp = fopen(filename, "r");
+               if (fp != NULL) {
+                       fmout(screenwidth, fp, NULL, 0, screenheight, 0, 0);
                        beg = ftell(fp);
                        fclose(fp);
+               } else {
+                       fp = fopen(filename, "w");
+                       if (fp == NULL) {
+                               err_printf("*** Error opening temp file!\n"
+                                       "    %s: %s\n",
+                                       filename, strerror(errno));
+                       return(1);
                        }
-               else {
-                       fp=fopen(filename,"w");
                        fclose(fp);
-                       }
                }
+       }
 
-ME1:   switch(mode) {
+ME1:   switch (mode) {
 
-          case 0:
-               fp=fopen(filename,"r+");
-               citedit(fp,beg);
+       case 0:
+               fp = fopen(filename, "r+");
+               if (fp == NULL) {
+                       err_printf("*** Error opening temp file!\n"
+                               "    %s: %s\n",
+                               filename, strerror(errno));
+                       return(1);
+               }
+               citedit(fp);
                fclose(fp);
                goto MECR;
-               break;
 
-          case 1:
-               fp=fopen(filename,"w");
+       case 1:
+               fp = fopen(filename, "a");
+               if (fp == NULL) {
+                       err_printf("*** Error opening temp file!\n"
+                               "    %s: %s\n",
+                               filename, strerror(errno));
+                       return(1);
+               }
                do {
-                       a=inkey(); if (a==255) a=32;
-                       if (a==13) a=10;
-                       if (a!=4) {
-                               putc(a,fp);
-                               putc(a,stdout);
-                               }
-                       if (a==10) putc(13,stdout);
-                       } while(a!=4);
+                       a = inkey();
+                       if (a == 255)
+                               a = 32;
+                       if (a == 13)
+                               a = 10;
+                       if (a != 4) {
+                               putc(a, fp);
+                               scr_putc(a);
+                       }
+                       if (a == 10)
+                               scr_putc(10);
+               } while (a != 4);
                fclose(fp);
                break;
 
-          case 2:
+       case 2:
                e_ex_code = 1;  /* start with a failed exit code */
-               editor_pid=fork();
+               editor_pid = fork();
                cksum = file_checksum(filename);
-               if (editor_pid==0) {
-                       chmod(filename,0600);
+               if (editor_pid == 0) {
+                       char tmp[SIZ];
+
+                       chmod(filename, 0600);
+                       screen_reset();
                        sttybbs(SB_RESTORE);
-                       execlp(editor_path,editor_path,filename,NULL);
+                       snprintf(tmp, sizeof tmp, "WINDOW_TITLE=%s", header);
+                       putenv(tmp);
+                       execlp(editor_path, editor_path, filename, NULL);
                        exit(1);
-                       }
-               if (editor_pid>0) do {
-                       e_ex_code = 0;
-                       b=ka_wait(&e_ex_code);
-                       } while((b!=editor_pid)&&(b>=0));
+               }
+               if (editor_pid > 0)
+                       do {
+                               e_ex_code = 0;
+                               b = ka_wait(&e_ex_code);
+                       } while ((b != editor_pid) && (b >= 0));
                editor_pid = (-1);
                sttybbs(0);
+               screen_set();
                break;
-               }
+       }
 
-MECR:  if (mode==2) {
+MECR:  if (mode == 2) {
                if (file_checksum(filename) == cksum) {
-                       printf("*** Aborted message.\n");
+                       err_printf("*** Aborted message.\n");
                        e_ex_code = 1;
-                       }
-               if (e_ex_code==0) goto MEFIN;
-               goto MEABT2;
                }
-MECR1: printf("Entry cmd (? for options) -> ");
-MECR2: b=inkey();
-       if (b==NEXT_KEY) b='n';
-       if (b==STOP_KEY) b='s';
-       b=(b&127); b=tolower(b);
-       if (b=='?') {
-               printf("Help\n");
-               formout("saveopt");
-               goto MECR1;
+               if (e_ex_code == 0)
+                       goto MEFIN;
+               goto MEABT2;
+       }
+
+       b = keymenu("Entry command (? for options)",
+                   "<A>bort|<C>ontinue|<S>ave message|<P>rint formatted|"
+                   "add s<U>bject|"
+                   "<R>eplace string|<H>old message");
+
+       if (b == 'a')
+               goto MEABT;
+       if (b == 'c')
+               goto ME1;
+       if (b == 's')
+               goto MEFIN;
+       if (b == 'p') {
+               scr_printf(" %s from %s", datestr, fullname);
+               if (strlen(recipient) > 0)
+                       scr_printf(" to %s", recipient);
+               scr_printf("\n");
+               if (subject != NULL) if (strlen(subject) > 0) {
+                       scr_printf("Subject: %s\n", subject);
                }
-       if (b=='a') { printf("Abort\n");        goto MEABT;     }
-       if (b=='c') { printf("Continue\n");     goto ME1;       }
-       if (b=='s') { printf("Save message\n"); goto MEFIN;     } 
-       if (b=='p') {
-               printf("Print formatted\n");
-               printf(" %s from %s",datestr,fullname);
-               if (strlen(recipient)>0) printf(" to %s",recipient);
-               printf("\n");
-               fp=fopen(filename,"r");
-               if (fp!=NULL) {
-                       fmout(screenwidth,fp,
-                               ((userflags & US_PAGINATOR) ? 1 : 0),
-                               screenheight,0,0);
+               fp = fopen(filename, "r");
+               if (fp != NULL) {
+                       fmout(screenwidth, fp, NULL,
+                             ((userflags & US_PAGINATOR) ? 1 : 0),
+                             screenheight, 0, 0);
                        beg = ftell(fp);
                        fclose(fp);
-                       }
-               goto MECR;
                }
-       if (b=='r') {
-               printf("Replace string\n");
-               replace_string(filename,0L);
                goto MECR;
+       }
+       if (b == 'r') {
+               replace_string(filename, 0L);
+               goto MECR;
+       }
+       if (b == 'h') {
+               return (2);
+       }
+       if (b == 'u') {
+               if (subject != NULL) {
+                       newprompt("Subject: ", subject, 70);
                }
-       if (b=='h') {
-               printf("Hold message\n");
-               return(2);
-               }
-       goto MECR2;
+               goto MECR;
+       }
 
-MEFIN: return(0);
+MEFIN: return (0);
 
-MEABT: printf("Are you sure? ");
-       if (yesno()==0) goto ME1;
-MEABT2:        unlink(filename);
-       return(2);
+MEABT: scr_printf("Are you sure? ");
+       if (yesno() == 0) {
+               goto ME1;
        }
+MEABT2:        unlink(filename);
+       return (2);
+}
 
 /*
- * transmit message text to the server
+ * Transmit message text to the server.
+ * 
+ * This loop also implements a "tick" counter that displays the progress, if
+ * we're sending something that will take a long time to transmit.
  */
 void transmit_message(FILE *fp)
 {
-       char buf[256];
-       int ch,a;
-       
-       strcpy(buf,"");
-       while (ch=getc(fp), (ch>=0)) {
-               if (ch==10) {
-                       if (!strcmp(buf,"000")) strcpy(buf,">000");
+       char buf[SIZ];
+       int ch, a;
+       long msglen;
+       time_t lasttick;
+
+       fseek(fp, 0L, SEEK_END);
+       msglen = ftell(fp);
+       rewind(fp);
+       lasttick = time(NULL);
+       strcpy(buf, "");
+       while (ch = getc(fp), (ch >= 0)) {
+               if (ch == 10) {
+                       if (!strcmp(buf, "000"))
+                               strcpy(buf, ">000");
                        serv_puts(buf);
-                       strcpy(buf,"");
-                       }
-               else {
+                       strcpy(buf, "");
+               } else {
                        a = strlen(buf);
-                       buf[a+1] = 0;
+                       buf[a + 1] = 0;
                        buf[a] = ch;
-                       if ((ch==32)&&(strlen(buf)>200)) {
-                               buf[a]=0;
-                               if (!strcmp(buf,"000")) strcpy(buf,">000");
+                       if ((ch == 32) && (strlen(buf) > 200)) {
+                               buf[a] = 0;
+                               if (!strcmp(buf, "000"))
+                                       strcpy(buf, ">000");
                                serv_puts(buf);
-                               strcpy(buf,"");
-                               }
-                       if (strlen(buf)>250) {
-                               if (!strcmp(buf,"000")) strcpy(buf,">000");
+                               strcpy(buf, "");
+                       }
+                       if (strlen(buf) > 250) {
+                               if (!strcmp(buf, "000"))
+                                       strcpy(buf, ">000");
                                serv_puts(buf);
-                               strcpy(buf,"");
-                               }
+                               strcpy(buf, "");
                        }
                }
-       serv_puts(buf);
+
+               if ((time(NULL) - lasttick) > 2L) {
+                       scr_printf(" %3ld%% completed\r",
+                              ((ftell(fp) * 100L) / msglen));
+                       scr_flush();
+                       lasttick = time(NULL);
+               }
+
        }
+       serv_puts(buf);
+       scr_printf("                \r");
+       scr_flush();
+}
 
 
 
@@ -704,344 +922,642 @@ void transmit_message(FILE *fp)
  * entmsg()  -  edit and create a message
  *              returns 0 if message was saved
  */
-int entmsg(int is_reply, int c)
-                       /* nonzero if this was a <R>eply command */
-       {               /* */
+int entmsg(int is_reply,       /* nonzero if this was a <R>eply command */
+               int c)          /* */
+{
        char buf[300];
-       char cmd[256];
-       int a,b;
+       char cmd[SIZ];
+       int a, b;
        int need_recp = 0;
        int mode;
        long highmsg;
        FILE *fp;
+       char subject[SIZ];
 
-       if (c>0) mode=1;
-       else mode=0;
+       if (c > 0)
+               mode = 1;
+       else
+               mode = 0;
 
-       sprintf(cmd,"ENT0 0||0|%d",mode);
+       strcpy(subject, "");
+
+       /*
+        * First, check to see if we have permission to enter a message in
+        * this room.  The server will return an error code if we can't.
+        */
+       snprintf(cmd, sizeof cmd, "ENT0 0||0|%d", mode);
        serv_puts(cmd);
        serv_gets(cmd);
 
-       if ((strncmp(cmd,"570",3)) && (strncmp(cmd,"200",3))) {
-               printf("%s\n",&cmd[4]);
-               return(1);
-               }
+       if ((strncmp(cmd, "570", 3)) && (strncmp(cmd, "200", 3))) {
+               scr_printf("%s\n", &cmd[4]);
+               return (1);
+       }
+
+       /* Error code 570 is special.  It means that we CAN enter a message
+        * in this room, but a recipient needs to be specified.
+        */
        need_recp = 0;
-       if (!strncmp(cmd,"570",3)) need_recp = 1;
+       if (!strncmp(cmd, "570", 3))
+               need_recp = 1;
 
-       if ((userflags & US_EXPERT) == 0) formout("entermsg");
-               
-       strcpy(buf,"");
-       if (need_recp==1) {
-               if (axlevel>=2) {
+       /* If the user is a dumbass, tell them how to type. */
+       if ((userflags & US_EXPERT) == 0) {
+               formout("entermsg");
+       }
+
+       /* Handle the selection of a recipient, if necessary. */
+       strcpy(buf, "");
+       if (need_recp == 1) {
+               if (axlevel >= 2) {
                        if (is_reply) {
-                               strcpy(buf,reply_to);
-                               }
+                               strcpy(buf, reply_to);
+                       } else {
+                               scr_printf("Enter recipient: ");
+                               getline(buf, (SIZ-100) );
+                               if (strlen(buf) == 0)
+                                       return (1);
+                       }
+               } else
+                       strcpy(buf, "sysop");
+       }
+
+       if (is_reply) {
+               if (strlen(reply_subject) > 0) {
+                       if (!strncasecmp(reply_subject,
+                          "Re: ", 3)) {
+                               strcpy(subject, reply_subject);
+                       }
                        else {
-                               printf("Enter recipient: ");
-                               getline(buf,299);
-                               if (strlen(buf)==0) return(1);
-                               }
+                               snprintf(subject,
+                                       sizeof subject,
+                                       "Re: %s",
+                                       reply_subject);
                        }
-               else strcpy(buf,"sysop");
                }
+       }
 
-       b=0;
-       if (room_flags&QR_ANON2) {
-               printf("Anonymous (Y/N)? ");
-               if (yesno()==1) b=1;
-               }
+       b = 0;
+       if (room_flags & QR_ANONOPT) {
+               scr_printf("Anonymous (Y/N)? ");
+               if (yesno() == 1)
+                       b = 1;
+       }
 
-/* if it's mail, we've got to check the validity of the recipient... */
-       if (strlen(buf)>0) {
-               sprintf(cmd,"ENT0 0|%s|%d|%d",buf,b,mode);
+       /* If it's mail, we've got to check the validity of the recipient... */
+       if (strlen(buf) > 0) {
+               snprintf(cmd, sizeof cmd, "ENT0 0|%s|%d|%d|%s", buf, b, mode, subject);
                serv_puts(cmd);
                serv_gets(cmd);
-               if (cmd[0]!='2') {
-                       printf("%s\n",&cmd[4]);
-                       return(1);
-                       }
+               if (cmd[0] != '2') {
+                       scr_printf("%s\n", &cmd[4]);
+                       return (1);
                }
+       }
 
-/* learn the number of the newest message in in the room, so we can tell
- * upon saving whether someone else has posted too
- */
+       /* Learn the number of the newest message in in the room, so we can
+        * tell upon saving whether someone else has posted too.
       */
        num_msgs = 0;
        serv_puts("MSGS LAST|1");
        serv_gets(cmd);
-       if (cmd[0]!='1') {
-               printf("%s\n",&cmd[5]);
-               }
-       else {
-               while (serv_gets(cmd), strcmp(cmd,"000")) {
+       if (cmd[0] != '1') {
+               scr_printf("%s\n", &cmd[5]);
+       } else {
+               while (serv_gets(cmd), strcmp(cmd, "000")) {
                        msg_arr[num_msgs++] = atol(cmd);
-                       }
                }
+       }
+
+       /* Now compose the message... */
+       if (client_make_message(temp, buf, b, 0, c, subject) != 0) {
+               return (2);
+       }
+
+       /* Reopen the temp file that was created, so we can send it */
+       fp = fopen(temp, "r");
 
-/* now put together the message */
-       a=make_message(temp,buf,b,0,c);
-       if (a!=0)
-       {
-          return(2);
+       /* Yes, unlink it now, so it doesn't stick around if we crash */
+       unlink(temp);
+
+       if (fp == NULL) {
+               err_printf("*** Internal error while trying to save message!\n"
+                       "    %s: %s\n",
+                       temp, strerror(errno));
+               return(errno);
        }
 
-/* and send it to the server */
-       sprintf(cmd,"ENT0 1|%s|%d|%d",buf,b,mode);
+       /* Transmit message to the server */
+       snprintf(cmd, sizeof cmd, "ENT0 1|%s|%d|%d|%s|", buf, b, mode, subject);
        serv_puts(cmd);
        serv_gets(cmd);
-       if (cmd[0]!='4') {
-               printf("%s\n",&cmd[4]);
-               return(1);
-               }
-       fp=fopen(temp,"r");
-       if (fp!=NULL) {
-               transmit_message(fp);
-               fclose(fp);
-               }
+       if (cmd[0] != '4') {
+               scr_printf("%s\n", &cmd[4]);
+               return (1);
+       }
+
+       transmit_message(fp);
        serv_puts("000");
-       unlink(temp);
-       
+
+       fclose(fp);
+
        highmsg = msg_arr[num_msgs - 1];
        num_msgs = 0;
        serv_puts("MSGS NEW");
        serv_gets(cmd);
-       if (cmd[0]!='1') {
-               printf("%s\n",&cmd[5]);
-               }
-       else {
-               while (serv_gets(cmd), strcmp(cmd,"000")) {
+       if (cmd[0] != '1') {
+               scr_printf("%s\n", &cmd[5]);
+       } else {
+               while (serv_gets(cmd), strcmp(cmd, "000")) {
                        msg_arr[num_msgs++] = atol(cmd);
-                       }
                }
+       }
 
        /* get new highest message number in room to set lrp for goto... */
        maxmsgnum = msg_arr[num_msgs - 1];
 
        /* now see if anyone else has posted in here */
-       b=(-1);
-       for (a=0; a<num_msgs; ++a) if (msg_arr[a]>highmsg) ++b;
+       b = (-1);
+       for (a = 0; a < num_msgs; ++a) {
+               if (msg_arr[a] > highmsg) {
+                       ++b;
+               }
+       }
 
-       /* in the Mail> room, this algorithm always counts one message
-        * higher than in public rooms, so we decrement it by one */
-       if (need_recp) --b;
+       /* In the Mail> room, this algorithm always counts one message
+        * higher than in public rooms, so we decrement it by one.
+        */
+       if (need_recp) {
+               --b;
+       }
 
-       if (b==1) printf(
-"*** 1 additional message has been entered in this room by another user.\n");
-       if (b>1) printf(
-"*** %d additional messages have been entered in this room by other users.\n",b);
+       if (b == 1) {
+               scr_printf("*** 1 additional message has been entered "
+                       "in this room by another user.\n");
+       }
+       else if (b > 1) {
+               scr_printf("*** %d additional messages have been entered "
+                       "in this room by other users.\n", b);
+       }
 
        return(0);
-       }
+}
 
-void process_quote(void) {     /* do editing on quoted file */
-FILE *qfile,*tfile;
-char buf[128];
-int line,qstart,qend;
+/*
+ * Do editing on a quoted file
+ */
+void process_quote(void)
+{
+       FILE *qfile, *tfile;
+       char buf[128];
+       int line, qstart, qend;
 
-       qfile = fopen(temp2,"r");
+       /* Unlink the second temp file as soon as it's opened, so it'll get
+        * deleted even if the program dies
+        */
+       qfile = fopen(temp2, "r");
+       unlink(temp2);
+
+       /* Display the quotable text with line numbers added */
        line = 0;
-       fgets(buf,128,qfile);
-       while (fgets(buf,128,qfile)!=NULL) {
-               printf("%2d %s",++line,buf);
-               }
-       printf("Begin quoting at [ 1] : ");
-       getline(buf,3);
-       qstart = (buf[0]==0) ? (1) : atoi(buf);
-       printf("  End quoting at [%d] : ",line);
-       getline(buf,3);
-       qend = (buf[0]==0) ? (line) : atoi(buf);
+       fgets(buf, 128, qfile);
+       while (fgets(buf, 128, qfile) != NULL) {
+               scr_printf("%2d %s", ++line, buf);
+       }
+       scr_printf("Begin quoting at [ 1] : ");
+       getline(buf, 3);
+       qstart = (buf[0] == 0) ? (1) : atoi(buf);
+       scr_printf("  End quoting at [%d] : ", line);
+       getline(buf, 3);
+       qend = (buf[0] == 0) ? (line) : atoi(buf);
        rewind(qfile);
-       line=0;
-       fgets(buf,128,qfile);
-       tfile=fopen(temp,"w");
-       while(fgets(buf,128,qfile)!=NULL) {
-               if ((++line>=qstart)&&(line<=qend)) fprintf(tfile," >%s",buf);
-               }
-       fprintf(tfile," \n");
+       line = 0;
+       fgets(buf, 128, qfile);
+       tfile = fopen(temp, "w");
+       while (fgets(buf, 128, qfile) != NULL) {
+               if ((++line >= qstart) && (line <= qend))
+                       fprintf(tfile, " >%s", buf);
+       }
+       fprintf(tfile, " \n");
        fclose(qfile);
        fclose(tfile);
-       unlink(temp2);
-       chmod(temp,0666);
+       chmod(temp, 0666);
+}
+
+
+
+/*
+ * List the URL's which were embedded in the previous message
+ */
+void list_urls()
+{
+       int i;
+       char cmd[SIZ];
+
+       if (num_urls == 0) {
+               scr_printf("There were no URL's in the previous message.\n\n");
+               return;
        }
 
+       for (i = 0; i < num_urls; ++i) {
+               scr_printf("%3d %s\n", i + 1, urls[i]);
+       }
+
+       if ((i = num_urls) != 1)
+               i = intprompt("Display which one", 1, 1, num_urls);
+
+       snprintf(cmd, sizeof cmd, rc_url_cmd, urls[i - 1]);
+       system(cmd);
+       scr_printf("\n");
+}
 
-void readmsgs(int c, int rdir, int q)  /* read contents of a room */
-               /* 0=Read all  1=Read new  2=Read old 3=Read last q */
-               /* 1=Forward (-1)=Reverse */
-               /* Number of msgs to read (if c==3) */
-       {
-       int a,b,e,f,g,start;
+/*
+ * Read the messages in the current room
+ */
+void readmsgs(
+       int c,          /* 0=Read all  1=Read new  2=Read old 3=Read last q */
+       int rdir,       /* 1=Forward (-1)=Reverse */
+       int q           /* Number of msgs to read (if c==3) */
+) {
+       int a, b, e, f, g, start;
+       int savedpos;
        int hold_sw = 0;
        char arcflag = 0;
        char quotflag = 0;
-       char prtfile[16];
+       int hold_color = 0;
+       char prtfile[PATH_MAX];
        char pagin;
-       char cmd[256];
-       char targ[20];
+       char cmd[SIZ];
+       char targ[ROOMNAMELEN];
+       char filename[SIZ];
+       FILE *dest = NULL;      /* Alternate destination other than screen */
 
-       signal(SIGINT,SIG_IGN);
-       signal(SIGQUIT,SIG_IGN);
+       if (c < 0)
+               b = (MAXMSGS - 1);
+       else
+               b = 0;
 
-       if (c<0) b=(MSGSPERRM-1);
-       else b=0;
-
-       sprintf(prtfile,"/tmp/CPrt%d",getpid());
+       strcpy(prtfile, tmpnam(NULL));
 
        num_msgs = 0;
-       strcpy(cmd,"MSGS ");
-       switch(c) {
-               case 0: strcat(cmd,"ALL");
-                       break;
-               case 1: strcat(cmd,"NEW");
-                       break;
-               case 2: strcat(cmd,"OLD");
-                       break;
-               case 3: sprintf(&cmd[strlen(cmd)], "LAST|%d", q);
-                       break;
-               }
+       strcpy(cmd, "MSGS ");
+       switch (c) {
+       case 0:
+               strcat(cmd, "ALL");
+               break;
+       case 1:
+               strcat(cmd, "NEW");
+               break;
+       case 2:
+               strcat(cmd, "OLD");
+               break;
+       case 3:
+               snprintf(&cmd[5], sizeof cmd - 5, "LAST|%d", q);
+               break;
+       }
        serv_puts(cmd);
        serv_gets(cmd);
-       if (cmd[0]!='1') {
-               printf("%s\n",&cmd[5]);
-               }
-       else {
-               while (serv_gets(cmd), strcmp(cmd,"000")) {
-                       msg_arr[num_msgs++] = atol(cmd);
+       if (cmd[0] != '1') {
+               scr_printf("%s\n", &cmd[5]);
+       } else {
+               while (serv_gets(cmd), strcmp(cmd, "000")) {
+                       if (num_msgs == MAXMSGS) {
+                               memcpy(&msg_arr[0], &msg_arr[1],
+                                      (sizeof(long) * (MAXMSGS - 1)));
+                               --num_msgs;
                        }
+                       msg_arr[num_msgs++] = atol(cmd);
                }
+       }
+
+       if (num_msgs == 0) {
+               if (c == 3) return;
+               scr_printf("*** There are no ");
+               if (c == 1) scr_printf("new ");
+               if (c == 2) scr_printf("old ");
+               scr_printf("messages in this room.\n");
+               return;
+       }
 
        lines_printed = 0;
 
        /* this loop cycles through each message... */
-       start = ( (rdir==1) ? 0 : (num_msgs-1) );
-       for (a=start; ((a<num_msgs)&&(a>=0)); a=a+rdir) {
-               while (msg_arr[a]==0L) {
-                       a=a+rdir; if ((a==MSGSPERRM)||(a==(-1))) return;
-                       }
+       start = ((rdir == 1) ? 0 : (num_msgs - 1));
+       for (a = start; ((a < num_msgs) && (a >= 0)); a = a + rdir) {
+               while (msg_arr[a] == 0L) {
+                       a = a + rdir;
+                       if ((a == MAXMSGS) || (a == (-1)))
+                               return;
+               }
 
-RAGAIN:                pagin=((arcflag==0)&&(quotflag==0)&&
-                       (userflags & US_PAGINATOR)) ? 1 : 0;
+RAGAIN:                pagin = ((arcflag == 0)
+                        && (quotflag == 0)
+                        && (userflags & US_PAGINATOR)) ? 1 : 0;
 
-       /* if we're doing a quote, set the screenwidth to 72 temporarily */
+               /* If we're doing a quote, set the screenwidth to 72 */
                if (quotflag) {
                        hold_sw = screenwidth;
                        screenwidth = 72;
-                       }
+               }
+
+               /* If printing or archiving, set the screenwidth to 80 */
+               if (arcflag) {
+                       hold_sw = screenwidth;
+                       screenwidth = 80;
+               }
 
-       /* now read the message... */
-               e=read_message(msg_arr[a],pagin);
+               /* now read the message... */
+               e = read_message(msg_arr[a], pagin, dest);
 
-       /* ...and set the screenwidth back if we have to */
-               if (quotflag) {
+               /* ...and set the screenwidth back if we have to */
+               if ((quotflag) || (arcflag)) {
                        screenwidth = hold_sw;
-                       }
-RMSGREAD:      fflush(stdout);
+               }
+RMSGREAD:      scr_flush();
                highest_msg_read = msg_arr[a];
                if (quotflag) {
-                       freopen("/dev/tty","r+",stdout);
-                       quotflag=0;
+                       fclose(dest);
+                       dest = NULL;
+                       quotflag = 0;
+                       enable_color = hold_color;
                        process_quote();
-                       }
+               }
                if (arcflag) {
-                       freopen("/dev/tty","r+",stdout);
-                       arcflag=0;
-                       f=fork();
-                       if (f==0) {
-                               freopen(prtfile,"r",stdin);
+                       fclose(dest);
+                       dest = NULL;
+                       arcflag = 0;
+                       enable_color = hold_color;
+                       f = fork();
+                       if (f == 0) {
+                               freopen(prtfile, "r", stdin);
+                               screen_reset();
                                sttybbs(SB_RESTORE);
                                ka_system(printcmd);
                                sttybbs(SB_NO_INTR);
+                               screen_set();
                                unlink(prtfile);
                                exit(0);
-                               }
-                       if (f>0) do {
-                               g=wait(NULL);
-                               } while((g!=f)&&(g>=0));
-                       printf("Message printed.\n");
                        }
-               if (e==3) return;
-               if ((userflags&US_NOPROMPT)||(e==2)) e='n';
-               else {
-                       printf("(%d) ",num_msgs-a-1);
-                       if (is_mail==1) printf("<R>eply ");
-                       if (strlen(printcmd)>0) printf("<P>rint ");
-               printf("<B>ack <A>gain <Q>uote <H>eader <N>ext <S>top -> ");
+                       if (f > 0)
+                               do {
+                                       g = wait(NULL);
+                               } while ((g != f) && (g >= 0));
+                       scr_printf("Message printed.\n");
+               }
+               if (rc_alt_semantics && c == 1) {
+                       char buf[SIZ];
+
+                       snprintf(buf, sizeof(buf), "SEEN %ld", msg_arr[a]);
+                       serv_puts(buf);
+                       serv_gets(buf); /* Don't need to check this? */
+               }
+               if (e == 3)
+                       return;
+               if (((userflags & US_NOPROMPT) || (e == 2))
+                   && (((room_flags & QR_MAILBOX) == 0)
+                       || (rc_force_mail_prompts == 0))) {
+                       e = 'n';
+               } else {
+                       color(DIM_WHITE);
+                       scr_printf("(");
+                       color(BRIGHT_WHITE);
+                       scr_printf("%d", num_msgs - a - 1);
+                       color(DIM_WHITE);
+                       scr_printf(") ");
+
+                       keyopt("<B>ack <A>gain <Q>uote <R>eply <N>ext <S>top m<Y> next ");
+                       if (rc_url_cmd[0] && num_urls)
+                               keyopt("<U>RLview ");
+                       keyopt("<?>help -> ");
+
                        do {
                                lines_printed = 2;
-                               e=(inkey()&127); e=tolower(e);
-/* return key same as <N> */   if (e==13) e='n';
-/* del/move for aides only */  if (!is_room_aide) if ((e=='d')||(e=='m')) e=0;
-/* print only if available */  if ((e=='p')&&(strlen(printcmd)==0)) e=0;
-/* can't move from Mail> */    if ((e=='m')&&(is_mail==1)) e=0;
-/* can't reply in public rms */        if ((e=='r')&&(is_mail!=1)) e=0;
-                               } while((e!='a')&&(e!='n')&&(e!='s')
-                                       &&(e!='d')&&(e!='m')&&(e!='p')
-                                       &&(e!='q')&&(e!='b')&&(e!='h')
-                                       &&(e!='r'));
-                       switch(e) {
-                               case 's':       printf("Stop\r");       break;
-                               case 'a':       printf("Again\r");      break;
-                               case 'd':       printf("Delete\r");     break;
-                               case 'm':       printf("Move\r");       break;
-                               case 'n':       printf("Next\r");       break;
-                               case 'p':       printf("Print\r");      break;
-                               case 'q':       printf("Quote\r");      break;
-                               case 'b':       printf("Back\r");       break;
-                               case 'h':       printf("Header\r");     break;
-                               case 'r':       printf("Reply\r");      break;
+                               e = (inkey() & 127);
+                               e = tolower(e);
+/* return key same as <N> */ if (e == 10)
+                                       e = 'n';
+/* space key same as <N> */ if (e == 32)
+                                       e = 'n';
+/* del/move for aides only */
+                                   if ((!is_room_aide)
+                                       && ((room_flags & QR_MAILBOX) ==
+                                           0)) {
+                                       if ((e == 'd') || (e == 'm'))
+                                               e = 0;
                                }
-                       if (userflags & US_DISAPPEAR)
-                               printf("%75s\r","");
-                       else
-                               printf("\n");
-                       fflush(stdout);
-                       }
-               switch(e) {
-                  case 'p':    fflush(stdout);
-                               freopen(prtfile,"w",stdout);
-                               arcflag = 1;
-                               goto RAGAIN;
-                  case 'q':    fflush(stdout);
-                               freopen(temp2,"w",stdout);
-                               quotflag = 1;
-                               goto RAGAIN;
-                  case 's':    return;
-                  case 'a':    goto RAGAIN;
-                  case 'b':    a=a-(rdir*2);
+/* print only if available */
+                               if ((e == 'p') && (strlen(printcmd) == 0))
+                                       e = 0;
+/* can't file if not allowed */
+                                   if ((e == 'f')
+                                       && (rc_allow_attachments == 0))
+                                       e = 0;
+/* link only if browser avail*/
+                                   if ((e == 'u')
+                                       && (strlen(rc_url_cmd) == 0))
+                                       e = 0;
+                       } while ((e != 'a') && (e != 'n') && (e != 's')
+                                && (e != 'd') && (e != 'm') && (e != 'p')
+                                && (e != 'q') && (e != 'b') && (e != 'h')
+                                && (e != 'r') && (e != 'f') && (e != '?')
+                                && (e != 'u') && (e != 'c') && (e != 'y'));
+                       switch (e) {
+                       case 's':
+                               scr_printf("Stop");
                                break;
-                  case 'm':    newprompt("Enter target room: ",targ,19);
-                               if (strlen(targ)>0) {
-                                       sprintf(cmd,"MOVE %ld|%s",
-                                               msg_arr[a],targ);
-                                       serv_puts(cmd);
-                                       serv_gets(cmd);
-                                       printf("%s\n",&cmd[4]);
-                                       if (cmd[0]=='2') msg_arr[a]=0L;
-                                       }
-                               else {
-                                       goto RMSGREAD;
-                                       }
-                               if (cmd[0]!='2') goto RMSGREAD;
+                       case 'a':
+                               scr_printf("Again");
                                break;
-                  case 'd':    printf("*** Delete this message? ");
-                               if (yesno()==1) {
-                                       sprintf(cmd,"DELE %ld",msg_arr[a]);
-                                       serv_puts(cmd);
-                                       serv_gets(cmd);
-                                       printf("%s\n",&cmd[4]);
-                                       if (cmd[0]=='2') msg_arr[a]=0L;
-                                       }
-                               else {
-                                       goto RMSGREAD;
-                                       }
+                       case 'd':
+                               scr_printf("Delete");
+                               break;
+                       case 'm':
+                               scr_printf("Move");
+                               break;
+                       case 'c':
+                               scr_printf("Copy");
+                               break;
+                       case 'n':
+                               scr_printf("Next");
+                               break;
+                       case 'p':
+                               scr_printf("Print");
+                               break;
+                       case 'q':
+                               scr_printf("Quote");
+                               break;
+                       case 'b':
+                               scr_printf("Back");
+                               break;
+                       case 'h':
+                               scr_printf("Header");
+                               break;
+                       case 'r':
+                               scr_printf("Reply");
                                break;
-                  case 'h':    read_message(msg_arr[a],READ_HEADER);
+                       case 'f':
+                               scr_printf("File");
+                               break;
+                       case 'u':
+                               scr_printf("URL's");
+                               break;
+                       case 'y':
+                               scr_printf("mY next");
+                               break;
+                       case '?':
+                               scr_printf("? <help>");
+                               break;
+                       }
+                       if (userflags & US_DISAPPEAR)
+                               scr_printf("\r%79s\r", "");
+                       else
+                               scr_printf("\n");
+                       scr_flush();
+               }
+               switch (e) {
+               case '?':
+                       scr_printf("Options available here:\n"
+                               " ?  Help (prints this message)\n"
+                               " S  Stop reading immediately\n"
+                               " A  Again (repeats last message)\n"
+                               " N  Next (continue with next message)\n"
+                               " Y  My Next (continue with next message you authored)\n"
+                               " B  Back (go back to previous message)\n");
+                       if ((is_room_aide)
+                           || (room_flags & QR_MAILBOX)) {
+                               scr_printf(" D  Delete this message\n"
+                                       " M  Move message to another room\n");
+                       }
+                       scr_printf(" C  Copy message to another room\n");
+                       if (strlen(printcmd) > 0)
+                               scr_printf(" P  Print this message\n");
+                       scr_printf(
+                               " Q  Quote portions of this message for your next post\n"
+                               " H  Headers (display message headers only)\n");
+                       if (is_mail)
+                               scr_printf(" R  Reply to this message\n");
+                       if (rc_allow_attachments)
+                               scr_printf
+                                   (" F  (save attachments to a file)\n");
+                       if (strlen(rc_url_cmd) > 0)
+                               scr_printf(" U  (list URL's for display)\n");
+                       scr_printf("\n");
+                       goto RMSGREAD;
+               case 'p':
+                       scr_flush();
+                       dest = fopen(prtfile, "w");
+                       arcflag = 1;
+                       hold_color = enable_color;
+                       enable_color = 0;
+                       goto RAGAIN;
+               case 'q':
+                       scr_flush();
+                       dest = fopen(temp2, "w");
+                       quotflag = 1;
+                       hold_color = enable_color;
+                       enable_color = 0;
+                       goto RAGAIN;
+               case 's':
+                       return;
+               case 'a':
+                       goto RAGAIN;
+               case 'b':
+                       a = a - (rdir * 2);
+                       break;
+               case 'm':
+               case 'c':
+                       newprompt("Enter target room: ",
+                                 targ, ROOMNAMELEN - 1);
+                       if (strlen(targ) > 0) {
+                               snprintf(cmd, sizeof cmd, "MOVE %ld|%s|%d",
+                                       msg_arr[a], targ,
+                                       (e == 'c' ? 1 : 0));
+                               serv_puts(cmd);
+                               serv_gets(cmd);
+                               scr_printf("%s\n", &cmd[4]);
+                               if (cmd[0] == '2')
+                                       msg_arr[a] = 0L;
+                       } else {
+                               goto RMSGREAD;
+                       }
+                       if (cmd[0] != '2')
                                goto RMSGREAD;
-                  case 'r':    entmsg(1,(DEFAULT_ENTRY==46 ? 2 : 0));
+                       break;
+               case 'f':
+                       newprompt("Which section? ", filename,
+                                 ((sizeof filename) - 1));
+                       snprintf(cmd, sizeof cmd,
+                                "OPNA %ld|%s", msg_arr[a], filename);
+                       serv_puts(cmd);
+                       serv_gets(cmd);
+                       if (cmd[0] == '2') {
+                               extract(filename, &cmd[4], 2);
+                               download_to_local_disk(filename,
+                                                      extract_int(&cmd[4],
+                                                                  0));
+                       } else {
+                               scr_printf("%s\n", &cmd[4]);
+                       }
+                       goto RMSGREAD;
+               case 'd':
+                       scr_printf("*** Delete this message? ");
+                       if (yesno() == 1) {
+                               snprintf(cmd, sizeof cmd, "DELE %ld", msg_arr[a]);
+                               serv_puts(cmd);
+                               serv_gets(cmd);
+                               scr_printf("%s\n", &cmd[4]);
+                               if (cmd[0] == '2')
+                                       msg_arr[a] = 0L;
+                       } else {
                                goto RMSGREAD;
                        }
-               } /* end for loop */
-       } /* end read routine */
+                       break;
+               case 'h':
+                       read_message(msg_arr[a], READ_HEADER, NULL);
+                       goto RMSGREAD;
+               case 'r':
+                       savedpos = num_msgs;
+                       entmsg(1, (DEFAULT_ENTRY == 46 ? 2 : 0));
+                       num_msgs = savedpos;
+                       goto RMSGREAD;
+               case 'u':
+                       list_urls();
+                       goto RMSGREAD;
+           case 'y':
+          { /* hack hack hack */
+            /* find the next message by me, stay here if we find nothing */
+            int finda;
+            int lasta = a;
+            for (finda = a; ((finda < num_msgs) && (finda >= 0)); finda += rdir)
+              {
+                /* this is repetitivly dumb, but that's what computers are for.
+                   We have to load up messages until we find one by us */
+                char buf[SIZ];
+                int founda = 0;
+                
+                       snprintf(buf, sizeof buf, "MSG0 %ld|%d", msg_arr[finda], 1); /* read the header so we can get 'from=' */
+               serv_puts(buf);
+               serv_gets(buf);
+               while (serv_gets(buf), strcmp(buf, "000")) 
+                  {
+                       if ((!strncasecmp(buf, "from=", 5)) && (finda != a)) /* Skip current message. */
+                     { 
+                        if (strcasecmp(buf+5, fullname) == 0)
+                          {
+                            a = lasta; /* meesa current */
+                            founda = 1;
+                          }
+                         }
+                 }
+                   // we are now in synch with the server
+                if (founda)
+                  break; /* for */
+                lasta = finda; /* keep one behind or we skip on the reentrance to the for */
+              } /* for */
+          } /* case 'y' */
+      } /* switch */
+       }                       /* end for loop */
+}                              /* end read routine */
 
 
 
@@ -1055,8 +1571,36 @@ void edit_system_message(char *which_message)
        char read_cmd[64];
        char write_cmd[64];
 
-       sprintf(desc, "system message '%s'", which_message);
-       sprintf(read_cmd, "MESG %s", which_message);
-       sprintf(write_cmd, "EMSG %s", which_message);
+       snprintf(desc, sizeof desc, "system message '%s'", which_message);
+       snprintf(read_cmd, sizeof read_cmd, "MESG %s", which_message);
+       snprintf(write_cmd, sizeof write_cmd, "EMSG %s", which_message);
        do_edit(desc, read_cmd, "NOOP", write_cmd);
+}
+
+
+
+
+/*
+ * Verify the message base
+ */
+void check_message_base(void)
+{
+       char buf[SIZ];
+
+       scr_printf
+           ("Please read the documentation before running this command.\n"
+           "Having done so, do you still want to check the message base? ");
+       if (yesno() == 0)
+               return;
+
+       serv_puts("FSCK");
+       serv_gets(buf);
+       if (buf[0] != '1') {
+               scr_printf("%s\n", &buf[4]);
+               return;
+       }
+
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               scr_printf("%s\n", buf);
        }
+}