]> code.citadel.org Git - citadel.git/blobdiff - citadel/messages.c
* Replaced all "Citadel/UX" references with "Citadel"
[citadel.git] / citadel / messages.c
index 648f1199430e386c252a4cbe347d7cb75842ee2d..f29dddfbe6554acea109c2deffd99311a8122ea2 100644 (file)
@@ -1,7 +1,8 @@
 /*
- * Citadel/UX message support routines
- * see copyright.txt for copyright information
  * $Id$
+ *
+ * Citadel message support routines
+ * see copyright.txt for copyright information
  */
 
 #include "sysdep.h"
 #include <limits.h>
 #include <sys/wait.h>
 #include <sys/stat.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_PTHREAD_H
+#include <pthread.h>
+#endif
+
 #include <stdarg.h>
 #include "citadel.h"
+#include "citadel_ipc.h"
+#include "citadel_decls.h"
 #include "messages.h"
 #include "commands.h"
 #include "rooms.h"
 #include "tools.h"
+#include "html.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
+#include "screen.h"
 
-#define MAXWORDBUF 256
-#define MAXMSGS 512
+#define MAXWORDBUF SIZ
+#define NO_REPLY_TO    "nobody ... xxxxxx"
+
+char reply_to[SIZ];
+char reply_subject[SIZ];
 
 struct cittext {
        struct cittext *next;
        char text[MAXWORDBUF];
-       };
+};
 
 void sttybbs(int cmd);
-int struncmp(char *lstr, char *rstr, int len);
-int fmout(int width, FILE *fp, char pagin, int height, int starting_lp, char subst);
-int haschar(char *st, int ch);
-int checkpagin(int lp, int pagin, int height);
+int haschar(const char *st, int ch);
 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);
+void progress(CtdlIPC* ipc, unsigned long curr, unsigned long cmax);
 
-char reply_to[512];
-long msg_arr[MAXMSGS];
+unsigned long *msg_arr = NULL;
+int msg_arr_size = 0;
 int num_msgs;
+char rc_alt_semantics;
+char rc_reply_extedit;
 extern char room_name[];
 extern unsigned room_flags;
 extern long highest_msg_read;
-extern struct CtdlServInfo serv_info;
 extern char temp[];
 extern char temp2[];
 extern int screenwidth;
@@ -67,23 +85,26 @@ extern char fullname[];
 extern char axlevel;
 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;
+extern CtdlIPC *ipc_for_signal_handlers;       /* KLUDGE cover your eyes */
+int num_urls = 0;
+char urls[MAXURLS][SIZ];
+char imagecmd[SIZ];
+int has_images = 0;                            /* Current msg has images */
+struct parts *last_message_parts = NULL;       /* Parts from last msg */
 
-int lines_printed;
 
-void ka_sigcatch(int signum) {
-       char buf[256];
+
+void ka_sigcatch(int signum)
+{
        alarm(S_KEEPALIVE);
        signal(SIGALRM, ka_sigcatch);
-       serv_puts("NOOP");
-       serv_gets(buf);
-       }
+       CtdlIPCNoop(ipc_for_signal_handlers);
+}
 
 
 /*
@@ -98,11 +119,11 @@ pid_t ka_wait(int *kstatus)
        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);
+}
 
 
 /*
@@ -119,24 +140,24 @@ int ka_system(char *shc)
                color(BRIGHT_RED);
                perror("Cannot fork");
                color(DIM_WHITE);
-               return((pid_t)childpid);
-               }
+               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);
+}
+
 
 
 /*
@@ -146,19 +167,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, "");
+}
 
 
 /*
@@ -168,29 +190,29 @@ 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
  */
-void citedit(FILE *fp)
+void citedit(CtdlIPC *ipc, 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;
@@ -198,30 +220,29 @@ void citedit(FILE *fp)
 
        /* first, load the text into the buffer */
        fseek(fp, 0L, 0);
-       textlist = (struct cittext *)malloc(sizeof(struct cittext));
+       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,"");
+               if (strlen(wordbuf) + 3 > screenwidth) {
+                       add_word(textlist, wordbuf);
+                       strcpy(wordbuf, "");
                }
                prev = a;
        }
@@ -229,287 +250,489 @@ void citedit(FILE *fp)
        /* 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;
-
+               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");
-                       printf(" ");
+               if ((a > 32) && (a < 127) && (prev == 13)) {
+                       add_word(textlist, "\n");
+                       scr_printf(" ");
                }
        /***********************/
 
-               if ((a==32)&&(prev==13)) {
-                       add_word(textlist,"\n");
+               if ((a == 32) && (prev == 13)) {
+                       add_word(textlist, "\n");
                        add_newline(textlist);
                }
 
-               if (a==8) {
-                       if (strlen(wordbuf)>0) {
-                               wordbuf[strlen(wordbuf)-1] = 0;
-                               putc(8,stdout);
-                               putc(32,stdout);
-                               putc(8,stdout);
+               if (a == 8) {
+                       if (strlen(wordbuf) > 0) {
+                               wordbuf[strlen(wordbuf) - 1] = 0;
+                               scr_putc(8);
+                               scr_putc(32);
+                               scr_putc(8);
                        }
-               }
-               else if (a==13) {
-                       printf("\n");
-                       if (strlen(wordbuf)==0) finished = 1;
+               } else if (a == 23) {
+                       do {
+                               wordbuf[strlen(wordbuf) - 1] = 0;
+                               scr_putc(8);
+                               scr_putc(32);
+                               scr_putc(8);
+                       } while (strlen(wordbuf) && wordbuf[strlen(wordbuf) - 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;
-                               }
-                               add_word(textlist,wordbuf);
-                               strcpy(wordbuf,"");
+                               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, "");
                        }
-               }
-               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) {
-                                       putc(8,stdout);
-                                       putc(32,stdout);
-                                       putc(8,stdout);
+                       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) {
+                                       scr_putc(8);
+                                       scr_putc(32);
+                                       scr_putc(8);
                                }
-                               printf("\n%s",wordbuf);
-                       }
-                       else {
-                               add_word(textlist,wordbuf);
-                               strcpy(wordbuf,"");
-                               printf("\n");
+                               scr_printf("\n%s", wordbuf);
+                       } else {
+                               add_word(textlist, wordbuf);
+                               strcpy(wordbuf, "");
+                               scr_printf("\n");
                        }
                }
                prev = a;
-       } while (finished==0);
+       } while (finished == 0);
        async_ka_end();
 
        /* write the buffer back to disk */
        fseek(fp, 0L, 0);
-       for (ptr=textlist; ptr!=NULL; ptr=ptr->next) {
-               fprintf(fp,"%s",ptr->text);
-               }
-       putc(10,fp);
+       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;
+       }
+}
+
+
+/*
+ * Free the struct parts
+ */
+void free_parts(struct parts *p)
+{
+       struct parts *a_part = p;
+
+       while (a_part) {
+               struct parts *q;
+
+               q = a_part;
+               a_part = a_part->next;
+               free(q);
        }
 }
 
 
-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(CtdlIPC *ipc,
+       long num,   /* message number */
+       int 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], node[256], rfca[256];
-       char now[256];
+       char buf[SIZ];
+       char now[SIZ];
        int format_type = 0;
        int fr = 0;
        int nhdr = 0;
+       struct ctdlipcmessage *message = NULL;
+       int r;                          /* IPC response code */
+       char *converted_text = NULL;
+       char *lineptr;
+       char *nextline;
+       char *searchptr;
+       int i;
+       char ch;
+       int linelen;
+       int final_line_is_blank = 0;
+
+       has_images = 0;
 
        sigcaught = 0;
        sttybbs(1);
 
-       sprintf(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);
+       strcpy(reply_to, NO_REPLY_TO);
+       strcpy(reply_subject, "");
+
+       r = CtdlIPCGetSingleMessage(ipc, num, (pagin == READ_HEADER ? 1 : 0),
+                               (can_do_msg4 ? 4 : 0),
+                               &message, buf);
+       if (r / 100 != 1) {
+               err_printf("*** msg #%ld: %d %s\n", num, r, 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, "");
-
-       printf("\n");
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,screenheight);
-       printf(" ");
-       if (pagin == 1) color(BRIGHT_CYAN);
-
-       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);
+               if (pagin != 2)
+                       scr_printf(" ");
+       }
+       if (pagin == 1 && !dest) {
+               color(BRIGHT_CYAN);
+       }
+
+       /* View headers only */
+       if (pagin == 2) {
+               pprintf("nhdr=%s\nfrom=%s\ntype=%d\nmsgn=%s\n",
+                               message->nhdr ? "yes" : "no",
+                               message->author, message->type,
+                               message->msgid);
+               if (strlen(message->subject)) {
+                       pprintf("subj=%s\n", message->subject);
+               }
+               if (strlen(message->email)) {
+                       pprintf("rfca=%s\n", message->email);
+               }
+               pprintf("hnod=%s\nroom=%s\nnode=%s\ntime=%s",
+                               message->hnod, message->room,
+                               message->node, 
+                               asctime(localtime(&message->time)));
+               if (strlen(message->recipient)) {
+                       pprintf("rcpt=%s\n", message->recipient);
+               }
+               if (message->attachments) {
+                       struct parts *ptr;
+
+                       for (ptr = message->attachments; ptr; ptr = ptr->next) {
+                               pprintf("part=%s|%s|%s|%s|%s|%ld\n",
+                                       ptr->name, ptr->filename, ptr->number,
+                                       ptr->disposition, ptr->mimetype,
+                                       ptr->length);
                        }
-               sttybbs(0);
-               return(0);
                }
+               pprintf("\n");
+               sttybbs(0);
+               return (0);
+       }
 
-       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]);
-                       }
-               if (nhdr==1) buf[0]='_';
-               if (!struncmp(buf,"type=",5))
-                       format_type=atoi(&buf[5]);
-               if ((!struncmp(buf,"msgn=",5))&&(rc_display_message_numbers)) {
+       if (rc_display_message_numbers) {
+               if (dest) {
+                       fprintf(dest, "[#%s] ", message->msgid);
+               } else {
                        color(DIM_WHITE);
-                       printf("[");
+                       scr_printf("[");
                        color(BRIGHT_WHITE);
-                       printf("#%s",&buf[5]);
+                       scr_printf("#%s", message->msgid);
                        color(DIM_WHITE);
-                       printf("] ");
+                       scr_printf("] ");
+               }
+       }
+       if (nhdr == 1 && !is_room_aide) {
+               if (dest) {
+                       fprintf(dest, " ****");
+               } else {
+                       scr_printf(" ****");
+               }
+       } else {
+               fmt_date(now, sizeof now, message->time, 0);
+               if (dest) {
+                       fprintf(dest, "%s from %s ", now, message->author);
+                       if (strlen(message->email)) {
+                               fprintf(dest, "<%s> ", message->email);
                        }
-               if (!struncmp(buf,"from=",5)) {
-                       color(DIM_WHITE);
-                       printf("from ");
+               } else {
                        color(BRIGHT_CYAN);
-                       printf("%s ",&buf[5]);
-                       }
-               if (!struncmp(buf,"subj=",5))
-                       strcpy(m_subject,&buf[5]);
-
-               if (!struncmp(buf,"rfca=",5)) {
-                       safestrncpy(rfca, &buf[5], sizeof(rfca) - 5);
-                       color(DIM_WHITE);
-                       printf("<");
-                       color(BRIGHT_BLUE);
-                       printf("%s",&buf[5]);
-                       color(DIM_WHITE);
-                       printf("> ");
-                       }
-               if ((!struncmp(buf,"hnod=",5)) 
-                  && (strucmp(&buf[5],serv_info.serv_humannode))
-                  && (strlen(rfca) == 0) ) {
-                       color(DIM_WHITE);
-                       printf("(");
-                       color(BRIGHT_WHITE);
-                       printf("%s",&buf[5]);
+                       scr_printf("%s ", now);
                        color(DIM_WHITE);
-                       printf(") ");
-                       }
-               if ((!struncmp(buf,"room=",5))
-                  && (strucmp(&buf[5],room_name)) 
-                  && (strlen(rfca) == 0)) {
-                       color(DIM_WHITE);
-                       printf("in ");
-                       color(BRIGHT_MAGENTA);
-                       printf("%s> ",&buf[5]);
-                       }
-
-               if (!struncmp(buf,"node=",5)) {
-                       safestrncpy(node, &buf[5], sizeof(buf) - 5);
-                       if ( (room_flags&QR_NETWORK)
-                          || ((strucmp(&buf[5],serv_info.serv_nodename)
-                          &&(strucmp(&buf[5],serv_info.serv_fqdn)))) ) 
-                               {
-                               if (strlen(rfca) == 0) {
+                       scr_printf("from ");
+                       color(BRIGHT_CYAN);
+                       scr_printf("%s ", message->author);
+                       if (strlen(message->email)) {
+                               color(DIM_WHITE);
+                               scr_printf("<");
+                               color(BRIGHT_BLUE);
+                               scr_printf("%s", message->email);
                                        color(DIM_WHITE);
-                                       printf("@");
-                                       color(BRIGHT_YELLOW);
-                                       printf("%s ",&buf[5]);
+                               scr_printf("> ");
+                       }
+               }
+               if (strlen(message->node)) {
+                       if ((room_flags & QR_NETWORK)
+                           || ((strcasecmp(message->node, ipc->ServInfo.nodename)
+                            && (strcasecmp(message->node, ipc->ServInfo.fqdn))))) {
+                               if (strlen(message->email) == 0) {
+                                       if (dest) {
+                                               fprintf(dest, "@%s ", message->node);
+                                       } else {
+                                               color(DIM_WHITE);
+                                               scr_printf("@");
+                                               color(BRIGHT_YELLOW);
+                                               scr_printf("%s ", message->node);
+                                       }
                                }
                        }
                }
-
-               if (!struncmp(buf,"rcpt=",5)) {
-                       color(DIM_WHITE);
-                       printf("to ");
-                       color(BRIGHT_CYAN);
-                       printf("%s ",&buf[5]);
+               if (strcasecmp(message->hnod, ipc->ServInfo.humannode)
+                   && (strlen(message->hnod)) && (!strlen(message->email))) {
+                       if (dest) {
+                               fprintf(dest, "(%s) ", message->hnod);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("(");
+                               color(BRIGHT_WHITE);
+                               scr_printf("%s", message->hnod);
+                               color(DIM_WHITE);
+                               scr_printf(") ");
                        }
-               if (!struncmp(buf,"time=",5)) {
-                       fmt_date(now, atol(&buf[5]));
-                       printf("%s ", now);
+               }
+               if (strcasecmp(message->room, room_name) && (strlen(message->email) == 0)) {
+                       if (dest) {
+                               fprintf(dest, "in %s> ", message->room);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("in ");
+                               color(BRIGHT_MAGENTA);
+                               scr_printf("%s> ", message->room);
                        }
                }
-
-       if (nhdr==1) {
-               if (!is_room_aide) {
-                       printf(" ****");
+               if (strlen(message->recipient)) {
+                       if (dest) {
+                               fprintf(dest, "to %s ", message->recipient);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("to ");
+                               color(BRIGHT_CYAN);
+                               scr_printf("%s ", message->recipient);
                        }
-               else {
-                       printf(" %s",from);
+               }
+       }
+       
+       if (dest) {
+               fprintf(dest, "\n");
+       } else {
+               scr_printf("\n");
+       }
+
+       /* Set the reply-to address to an Internet e-mail address if possible
+        */
+       if (message->email != NULL) if (strlen(message->email) > 0) {
+               safestrncpy(reply_to, message->email, sizeof reply_to);
+       }
+
+       /* But if we can't do that, set it to a Citadel address.
+        */
+       if (!strcmp(reply_to, NO_REPLY_TO)) {
+               snprintf(reply_to, sizeof(reply_to), "%s @ %s",
+                        message->author, message->node);
+       }
+
+       if (!dest) {
+               ++lines_printed;
+               lines_printed = checkpagin(lines_printed, pagin, screenheight);
+       }
+
+       if (message->subject != NULL) {
+               safestrncpy(reply_subject, message->subject,
+                                               sizeof reply_subject);
+               if (strlen(message->subject) > 0) {
+                       if (dest) {
+                               fprintf(dest, "Subject: %s\n",
+                                                       message->subject);
+                       } else {
+                               color(DIM_WHITE);
+                               scr_printf("Subject: ");
+                               color(BRIGHT_CYAN);
+                               scr_printf("%s\n", message->subject);
+                               ++lines_printed;
+                               lines_printed = checkpagin(lines_printed,
+                                               pagin, screenheight);
                        }
                }
-       printf("\n");
+       }
 
-       if (strlen(rfca) > 0) {
-               strcpy(reply_to, rfca);
+       if (pagin == 1 && !dest) {
+               color(BRIGHT_WHITE);
        }
-       else {
-               snprintf(reply_to, sizeof(reply_to), "%s @ %s", from, node);
+
+       /******* end of header output, start of message text output *******/
+
+       /*
+        * Convert HTML to plain text, formatting for the actual width
+        * of the client screen.
+        */
+       if (!strcasecmp(message->content_type, "text/html")) {
+               converted_text = html_to_ascii(message->text, screenwidth, 0);
+               if (converted_text != NULL) {
+                       free(message->text);
+                       message->text = converted_text;
+                       format_type = 1;
+               }
        }
 
-       if (pagin == 1) color(BRIGHT_WHITE);
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,screenheight);
+       /* Text/plain is a different type */
+       if (!strcasecmp(message->content_type, "text/plain")) {
+               format_type = 1;
+       }
 
-       if (strlen(m_subject)>0) {
-               printf("Subject: %s\n",m_subject);
-               ++lines_printed;
-               lines_printed = checkpagin(lines_printed,pagin,screenheight);
+       /* Extract URL's */
+       num_urls = 0;   /* Start with a clean slate */
+       searchptr = message->text;
+       while ( (searchptr != NULL) && (num_urls < MAXURLS) ) {
+               searchptr = strstr(searchptr, "http://");
+               if (searchptr != NULL) {
+                       safestrncpy(urls[num_urls], searchptr, sizeof(urls[num_urls]));
+                       for (i = 0; i < strlen(urls[num_urls]); i++) {
+                               ch = urls[num_urls][i];
+                               if (ch == '>' || ch == '\"' || ch == ')' ||
+                                   ch == ' ' || ch == '\n') {
+                                       urls[num_urls][i] = 0;
+                                       break;
+                               }
+                       }
+                       num_urls++;
+                       ++searchptr;
                }
+       }
 
+       /*
+        * Here we go
+        */
        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, message->text, dest,
+                          ((pagin == 1) ? 1 : 0), screenheight, (-1), 1);
+       } else {
+               /* renderer for text/plain */
+
+               lineptr = message->text;
+
+               do {
+                       nextline = strchr(lineptr, '\n');
+                       if (nextline != NULL) {
+                               *nextline = 0;
+                               ++nextline;
+                               if (*nextline == 0) nextline = NULL;
+                       }
+
+                       if (sigcaught == 0) {
+                               linelen = strlen(lineptr);
+                               if (lineptr[linelen-1] == '\r') {
+                                       lineptr[--linelen] = 0;
+                               }
+                               if (dest) {
+                                       fprintf(dest, "%s\n", lineptr);
+                               } else {
+                                       scr_printf("%s\n", lineptr);
+                                       lines_printed = lines_printed + 1 +
+                                           (linelen / screenwidth);
+                                       lines_printed =
+                                           checkpagin(lines_printed, pagin,
+                                                      screenheight);
                                }
                        }
+                       if (lineptr[0] == 0) final_line_is_blank = 1;
+                       else final_line_is_blank = 0;
+                       lineptr = nextline;
+               } while (nextline);
                fr = sigcaught;
+       }
+       if (!final_line_is_blank) {
+               if (dest) {
+                       fprintf(dest, "\n");
                }
-       printf("\n");
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,screenheight);
+               else {
+                       scr_printf("\n");
+                       ++lines_printed;
+                       lines_printed = checkpagin(lines_printed, pagin, screenheight);
+               }
+       }
 
-       if (pagin == 1) color(DIM_WHITE);
-       sttybbs(0);
-       return(fr);
+       /* Enumerate any attachments */
+       if ( (pagin == 1) && (can_do_msg4) && (message->attachments) ) {
+               struct parts *ptr;
+
+               for (ptr = message->attachments; ptr; ptr = ptr->next) {
+                       if ( (!strcasecmp(ptr->disposition, "attachment"))
+                          || (!strcasecmp(ptr->disposition, "inline"))) {
+                               color(DIM_WHITE);
+                               pprintf("Part ");
+                               color(BRIGHT_MAGENTA);
+                               pprintf("%s", ptr->number);
+                               color(DIM_WHITE);
+                               pprintf(": ");
+                               color(BRIGHT_CYAN);
+                               pprintf("%s", ptr->filename);
+                               color(DIM_WHITE);
+                               pprintf(" (%s, %ld bytes)\n", ptr->mimetype, ptr->length);
+                               if (!strncmp(ptr->mimetype, "image/", 6))
+                                       has_images++;
+                       }
+               }
        }
 
+       /* Save the attachments info for later */
+       last_message_parts = message->attachments;
+
+       /* Now we're done */
+       free(message->text);
+       free(message);
+
+       if (pagin == 1 && !dest)
+               color(DIM_WHITE);
+       sttybbs(0);
+       return (fr);
+}
+
 /*
  * replace string function for the built-in editor
  */
@@ -520,191 +743,274 @@ 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, (sizeof(srch_str)-1) );
+       if (strlen(srch_str) == 0)
+               return;
+
+       scr_printf("Enter text to replace it with:\n: ");
+       getline(rplc_str, (sizeof(rplc_str)-1) );
 
-       fp=fopen(filename,"r+");
-       if (fp==NULL) return;
+       fp = fopen(filename, "r+");
+       if (fp == NULL)
+               return;
 
-       wpos=startpos;
-       fseek(fp,startpos,0);
-       strcpy(buf,"");
-       while (a=getc(fp), a>0) {
+       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 (!strncmp(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);
+       }
+       fseek(fp, wpos, 0);
+       if (strlen(buf) > 0)
+               fwrite((char *) buf, strlen(buf), 1, fp);
        wpos = ftell(fp);
        fclose(fp);
        truncate(filename, wpos);
-       printf("<R>eplace made %d substitution(s).\n\n",substitutions);
-       }
-
+       scr_printf("<R>eplace made %d substitution(s).\n\n", substitutions);
+}
 
-int make_message(char *filename,       /* temporary file name */
+/*
+ * Function to begin composing a new message
+ */
+int client_make_message(CtdlIPC *ipc,
+               char *filename,         /* temporary file name */
                char *recipient,        /* NULL if it's not mail */
-               int anon_type,          /* see MES_ types in header file */
+               int is_anonymous,
                int format_type,
-               int mode)
-{ 
+               int mode,
+               char *subject)          /* buffer to store subject line */
+{
        FILE *fp;
-       int a,b,e_ex_code;
+       int a, b, e_ex_code;
        long beg;
-       char datestr[64];
+       char datestr[SIZ];
+       char header[SIZ];
+       char *editor_path = NULL;
        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((mode-2) < MAX_EDITORS && strlen(editor_paths[mode-2]) > 0) {
+                       editor_path = editor_paths[mode-2];
+               } else if (strlen(editor_paths[0]) > 0) {
+                       editor_path = editor_paths[0];
+               } else {
+                       err_printf
+                           ("*** No editor available, using built-in editor\n");
+                       mode = 0;
                }
+       }
 
-       fmt_date(datestr, time(NULL));
+       fmt_date(datestr, sizeof 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,
+                       (is_anonymous ? "[anonymous]" : 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, 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);
+       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(ipc, fp);
                fclose(fp);
                goto MECR;
 
-          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:
+       default:        /* allow 2+ modes */
                e_ex_code = 1;  /* start with a failed exit code */
-               editor_pid=fork();
+               screen_reset();
+               sttybbs(SB_RESTORE);
+               editor_pid = fork();
                cksum = file_checksum(filename);
-               if (editor_pid==0) {
-                       chmod(filename,0600);
-                       sttybbs(SB_RESTORE);
-                       execlp(editor_path,editor_path,filename,NULL);
+               if (editor_pid == 0) {
+                       char tmp[SIZ];
+
+                       chmod(filename, 0600);
+                       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;
                }
+               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|"
-               "<R>eplace string|<H>old message");
-
-       if (b=='a') goto MEABT;
-       if (b=='c') goto ME1;
-       if (b=='s') goto MEFIN;
-       if (b=='p') {
-               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);
+                   "<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);
+               }
+               fp = fopen(filename, "r");
+               if (fp != NULL) {
+                       fmout(screenwidth, fp, NULL, NULL,
+                             ((userflags & US_PAGINATOR) ? 1 : 0),
+                             screenheight, 0, 0);
                        beg = ftell(fp);
                        fclose(fp);
-                       }
-               goto MECR;
                }
-       if (b=='r') {
-               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') {
-               return(2);
-               }
+               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);
+}
+
 
+#if 0
 /*
- * 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)
+void transmit_message(CtdlIPC *ipc, FILE *fp)
 {
-       char buf[256];
-       int ch,a;
+       char buf[SIZ];
+       int ch, a;
        long msglen;
        time_t lasttick;
 
@@ -712,42 +1018,57 @@ void transmit_message(FILE *fp)
        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, "");
+       while (ch = getc(fp), (ch >= 0)) {
+               if (ch == 10) {
+                       if (!strcmp(buf, "000"))
+                               strcpy(buf, ">000");
+                       CtdlIPC_putline(ipc, buf);
+                       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");
-                               serv_puts(buf);
-                               strcpy(buf,"");
-                               }
-                       if (strlen(buf)>250) {
-                               if (!strcmp(buf,"000")) strcpy(buf,">000");
-                               serv_puts(buf);
-                               strcpy(buf,"");
-                               }
+                       if ((ch == 32) && (strlen(buf) > 200)) {
+                               buf[a] = 0;
+                               if (!strcmp(buf, "000"))
+                                       strcpy(buf, ">000");
+                               CtdlIPC_putline(ipc, buf);
+                               strcpy(buf, "");
                        }
-
-               if ( (time(NULL) - lasttick) > 2L ) {
-                       printf(" %3ld%% completed\r",
-                               ((ftell(fp) * 100L) / msglen) );
-                       fflush(stdout);
-                       lasttick = time(NULL);
+                       if (strlen(buf) > 250) {
+                               if (!strcmp(buf, "000"))
+                                       strcpy(buf, ">000");
+                               CtdlIPC_putline(ipc, buf);
+                               strcpy(buf, "");
                        }
+               }
 
+               if ((time(NULL) - lasttick) > 2L) {
+                       scr_printf(" %3ld%% completed\r",
+                              ((ftell(fp) * 100L) / msglen));
+                       scr_flush();
+                       lasttick = time(NULL);
                }
-       serv_puts(buf);
-       printf("                \r");
-       fflush(stdout);
+
+       }
+       CtdlIPC_putline(ipc, buf);
+       scr_printf("                \r");
+       scr_flush();
+}
+#endif
+
+
+/*
+ * Make sure there's room in msg_arr[] for at least one more.
+ */
+void check_msg_arr_size(void) {
+       if ((num_msgs + 1) > msg_arr_size) {
+               msg_arr_size += 512;
+               msg_arr = realloc(msg_arr,
+                       ((sizeof(long)) * msg_arr_size) );
        }
+}
 
 
 
@@ -755,455 +1076,766 @@ 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 */
-       {               /* */
-       char buf[300];
-       char cmd[256];
-       int a,b;
+int entmsg(CtdlIPC *ipc,
+               int is_reply,   /* nonzero if this was a <R>eply command */
+               int c)          /* mode */
+{
+       char buf[SIZ];
+       int a, b;
        int need_recp = 0;
        int mode;
-       long highmsg;
+       long highmsg = 0L;
        FILE *fp;
+       char subject[SIZ];
+       struct ctdlipcmessage message;
+       unsigned long *msgarr = NULL;
+       int r;                  /* IPC response code */
 
-       if (c>0) mode=1;
-       else mode=0;
+       if (c > 0)
+               mode = 1;
+       else
+               mode = 0;
 
-       sprintf(cmd,"ENT0 0||0|%d",mode);
-       serv_puts(cmd);
-       serv_gets(cmd);
+       strcpy(subject, "");
 
-       if ((strncmp(cmd,"570",3)) && (strncmp(cmd,"200",3))) {
-               printf("%s\n",&cmd[4]);
-               return(1);
-               }
+       /*
+        * 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.
+        */
+       strcpy(message.recipient, "");
+       strcpy(message.author, "");
+       strcpy(message.subject, "");
+       message.text = message.author;  /* point to "", changes later */
+       message.anonymous = 0;
+       message.type = mode;
+       r = CtdlIPCPostMessage(ipc, 0, &message, buf);
+
+       if (r / 100 != 2 && r / 10 != 57) {
+               scr_printf("%s\n", buf);
+               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 (r / 10 == 57)
+               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(ipc, "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");
+       }
+       strcpy(message.recipient, buf);
+
+       if (is_reply) {
+               if (strlen(reply_subject) > 0) {
+                       if (!strncasecmp(reply_subject,
+                          "Re: ", 3)) {
+                               strcpy(message.subject, reply_subject);
+                       }
                        else {
-                               printf("Enter recipient: ");
-                               getline(buf, 60);
-                               if (strlen(buf)==0) return(1);
-                               }
+                               snprintf(message.subject,
+                                       sizeof message.subject,
+                                       "Re: %s",
+                                       reply_subject);
                        }
-               else strcpy(buf,"sysop");
                }
+       }
 
-       b=0;
-       if (room_flags&QR_ANONOPT) {
-               printf("Anonymous (Y/N)? ");
-               if (yesno()==1) b=1;
-               }
+       if (room_flags & QR_ANONOPT) {
+               scr_printf("Anonymous (Y/N)? ");
+               if (yesno() == 1)
+                       message.anonymous = 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);
-               serv_puts(cmd);
-               serv_gets(cmd);
-               if (cmd[0]!='2') {
-                       printf("%s\n",&cmd[4]);
-                       return(1);
-                       }
+       /* If it's mail, we've got to check the validity of the recipient... */
+       if (strlen(message.recipient) > 0) {
+               r = CtdlIPCPostMessage(ipc, 0, &message, buf);
+               if (r / 100 != 2) {
+                       scr_printf("%s\n", buf);
+                       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")) {
-                       msg_arr[num_msgs++] = atol(cmd);
-                       }
-               }
+       r = CtdlIPCGetMessages(ipc, LastMessages, 1, NULL, &msgarr, buf);
+       if (r / 100 != 1) {
+               scr_printf("%s\n", buf);
+       } else {
+               for (num_msgs = 0; msgarr[num_msgs]; num_msgs++)
+                       ;
+       }
 
-/* now put together the message */
-       if ( make_message(temp,buf,b,0,c) != 0 ) return(2);
+       /* Now compose the message... */
+       if (client_make_message(ipc, temp, message.recipient, message.anonymous, 0, c, message.subject) != 0) {
+               return (2);
+       }
 
-/* and send it to the server */
-       sprintf(cmd,"ENT0 1|%s|%d|%d||",buf,b,mode);
-       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);
-               }
-       serv_puts("000");
+       /* Reopen the temp file that was created, so we can send it */
+       fp = fopen(temp, "r");
+
+       if (!fp || !(message.text = load_message_from_file(fp))) {
+               err_printf("*** Internal error while trying to save message!\n"
+                       "%s: %s\n",
+                       temp, strerror(errno));
+               unlink(temp);
+               return(errno);
+       }
+
+       if (fp) fclose(fp);
+
+       /* Transmit message to the server */
+       r = CtdlIPCPostMessage(ipc, 1, &message, buf);
+       if (r / 100 != 4) {
+               scr_printf("%s\n", buf);
+               return (1);
+       }
+
+       /* Yes, unlink it now, so it doesn't stick around if we crash */
        unlink(temp);
-       
-       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")) {
-                       msg_arr[num_msgs++] = atol(cmd);
-                       }
-               }
+
+       if (num_msgs >= 1) highmsg = msgarr[num_msgs - 1];
+
+       if (msgarr) free(msgarr);
+       msgarr = NULL;
+       r = CtdlIPCGetMessages(ipc, NewMessages, 0, NULL, &msgarr, buf);
+       if (r / 100 != 1) {
+               scr_printf("%s\n", buf);
+       } else {
+               for (num_msgs = 0; msgarr[num_msgs]; num_msgs++)
+                       ;
+       }
 
        /* get new highest message number in room to set lrp for goto... */
-       maxmsgnum = msg_arr[num_msgs - 1];
+       maxmsgnum = msgarr[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 (msgarr[a] > highmsg) {
+                       ++b;
+               }
+       }
+       if (msgarr) free(msgarr);
+       msgarr = NULL;
 
-       /* 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;
 
        /* 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");
+       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);
-       chmod(temp,0666);
-       }
+       chmod(temp, 0666);
+}
 
 
 
 /*
  * List the URL's which were embedded in the previous message
  */
-void list_urls() {
+void list_urls(CtdlIPC *ipc)
+{
        int i;
-       char cmd[256];
+       char cmd[SIZ];
 
        if (num_urls == 0) {
-               printf("There were no URL's in the previous message.\n\n");
+               scr_printf("There were no URL's in the previous message.\n\n");
                return;
        }
 
-       for (i=0; i<num_urls; ++i) {
-               printf("%3d %s\n", i+1, urls[i]);
+       for (i = 0; i < num_urls; ++i) {
+               scr_printf("%3d %s\n", i + 1, urls[i]);
        }
 
-       if((i = num_urls) != 1)
+       if ((i = num_urls) != 1)
                i = intprompt("Display which one", 1, 1, num_urls);
 
-       sprintf(cmd, rc_url_cmd, urls[i-1]);
+       snprintf(cmd, sizeof cmd, rc_url_cmd, urls[i - 1]);
        system(cmd);
-       printf("\n");
+       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;
-       int hold_sw = 0;
-       char arcflag = 0;
-       char quotflag = 0;
-       int hold_color = 0;
-       char prtfile[PATH_MAX];
-       char pagin;
-       char cmd[256];
-       char targ[ROOMNAMELEN];
-       char filename[256];
+/*
+ * Run image viewer in background
+ */
+int do_image_view(const char *filename)
+{
+       char cmd[SIZ];
+       pid_t childpid;
 
-       signal(SIGINT,SIG_IGN);
-       signal(SIGQUIT,SIG_IGN);
+       snprintf(cmd, sizeof cmd, imagecmd, filename);
+       childpid = fork();
+       if (childpid < 0) {
+               unlink(filename);
+               return childpid;
+       }
 
-       if (c<0) b=(MAXMSGS-1);
-       else b=0;
+       if (childpid == 0) {
+               int retcode;
+               pid_t grandchildpid;
 
-       sprintf(prtfile, tmpnam(NULL));
+               grandchildpid = fork();
+               if (grandchildpid < 0) {
+                       return grandchildpid;
+               }
 
-       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;
+               if (grandchildpid == 0) {
+                       int nullfd;
+                       int outfd = -1;
+                       int errfd = -1;
+
+                       nullfd = open("/dev/null", O_WRONLY);
+                       if (nullfd > -1) {
+                               dup2(1, outfd);
+                               dup2(2, errfd);
+                               dup2(nullfd, 1);
+                               dup2(nullfd, 2);
+                       }
+                       retcode = system(cmd);
+                       if (nullfd > -1) {
+                               dup2(outfd, 1);
+                               dup2(errfd, 2);
+                               close(nullfd);
+                       }
+                       unlink(filename);
+                       exit(retcode);
                }
-       serv_puts(cmd);
-       serv_gets(cmd);
-       if (cmd[0]!='1') {
-               printf("%s\n",&cmd[5]);
+
+               if (grandchildpid > 0) {
+                       exit(0);
                }
-       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;
+       }
+
+       if (childpid > 0) {
+               int retcode;
+
+               waitpid(childpid, &retcode, 0);
+               return retcode;
+       }
+       
+       return -1;
+}
+
+
+/*
+ * View an image attached to a message
+ */
+void image_view(CtdlIPC *ipc, unsigned long msg)
+{
+       struct parts *ptr = last_message_parts;
+       char part[SIZ];
+       int found = 0;
+
+       /* Run through available parts */
+       for (ptr = last_message_parts; ptr; ptr = ptr->next) {
+               if ((!strcasecmp(ptr->disposition, "attachment")
+                  || !strcasecmp(ptr->disposition, "inline"))
+                  && !strncmp(ptr->mimetype, "image/", 6)) {
+                       found++;
+                       if (found == 1) {
+                               strcpy(part, ptr->number);
+                       }
+               }
+       }
+
+       while (found > 0) {
+               if (found > 1)
+                       strprompt("View which part (0 when done)", part, SIZ-1);
+               found = -found;
+               for (ptr = last_message_parts; ptr; ptr = ptr->next) {
+                       if ((!strcasecmp(ptr->disposition, "attachment")
+                          || !strcasecmp(ptr->disposition, "inline"))
+                          && !strncmp(ptr->mimetype, "image/", 6)
+                          && !strcasecmp(ptr->number, part)) {
+                               char tmp[PATH_MAX];
+                               char buf[SIZ];
+                               void *file = NULL; /* The downloaded file */
+                               int r;
+       
+                               // view image
+                               found = -found;
+                               r = CtdlIPCAttachmentDownload(ipc, msg, ptr->number, &file, progress, buf);
+                               if (r / 100 != 2) {
+                                       scr_printf("%s\n", buf);
+                               } else {
+                                       size_t len;
+       
+                                       len = (size_t)extract_long(buf, 0);
+                                       progress(ipc, len, len);
+                                       scr_flush();
+                                       snprintf(tmp, sizeof tmp, "%s.%s",
+                                               tmpnam(NULL),
+                                               ptr->filename);
+                                       save_buffer(file, len, tmp);
+                                       free(file);
+                                       do_image_view(tmp);
                                }
-                       msg_arr[num_msgs++] = atol(cmd);
+                               break;
                        }
                }
+               if (found == 1)
+                       break;
+       }
+}
+
+/*
+ * Read the messages in the current room
+ */
+void readmsgs(CtdlIPC *ipc,
+       enum MessageList c,             /* see listing in citadel_ipc.h */
+       enum MessageDirection 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;
+       int hold_color = 0;
+       char prtfile[PATH_MAX];
+       char pagin;
+       char cmd[SIZ];
+       char targ[ROOMNAMELEN];
+       char filename[PATH_MAX];
+       char save_to[PATH_MAX];
+       void *attachment = NULL;        /* Downloaded attachment */
+       FILE *dest = NULL;      /* Alternate destination other than screen */
+       int r;                          /* IPC response code */
+
+       if (c < 0)
+               b = (num_msgs - 1);
+       else
+               b = 0;
+
+       strcpy(prtfile, tmpnam(NULL));
+
+       if (msg_arr) {
+               free(msg_arr);
+               msg_arr = NULL;
+       }
+       r = CtdlIPCGetMessages(ipc, c, q, NULL, &msg_arr, cmd);
+       if (r / 100 != 1) {
+               scr_printf("%s\n", cmd);
+       } else {
+               for (num_msgs = 0; msg_arr[num_msgs]; num_msgs++)
+                       ;
+       }
+
+       if (num_msgs == 0) {    /* TODO look at this later */
+               if (c == LastMessages) return;
+               scr_printf("*** There are no ");
+               if (c == NewMessages) scr_printf("new ");
+               if (c == OldMessages) 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==MAXMSGS)||(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 == num_msgs) || (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 temporarily */
+               /* If printing or archiving, set the screenwidth to 80 */
                if (arcflag) {
                        hold_sw = screenwidth;
                        screenwidth = 80;
-                       }
+               }
+
+               /* clear parts list */
+               free_parts(last_message_parts);
+               last_message_parts = NULL;
 
-       /* now read the message... */
-               e=read_message(msg_arr[a],pagin);
+               /* now read the message... */
+               e = read_message(ipc, msg_arr[a], pagin, dest);
 
-       /* ...and set the screenwidth back if we have to */
-               if ((quotflag)||(arcflag)) {
+               /* ...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;
+                       fclose(dest);
+                       dest = NULL;
+                       arcflag = 0;
                        enable_color = hold_color;
-                       f=fork();
-                       if (f==0) {
+                       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)) 
-                  && (((room_flags&QR_MAILBOX)==0)
-                    ||(rc_force_mail_prompts==0))  ) {
-                       e='n';
-                       }
-               else {
+                       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];
+
+                       r = CtdlIPCSetMessageSeen(ipc, msg_arr[a], 1, buf);
+               }
+               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);
-                       printf("(");
+                       scr_printf("(");
                        color(BRIGHT_WHITE);
-                       printf("%d",num_msgs-a-1);
+                       scr_printf("%d", num_msgs - a - 1);
                        color(DIM_WHITE);
-                       printf(") ");
+                       scr_printf(") ");
 
                        keyopt("<B>ack <A>gain <Q>uote <R>eply <N>ext <S>top ");
-                       if (rc_url_cmd[0] && num_urls) keyopt("<U>RL View ");
-                       keyopt("<?>Help/others -> ");
-                       
+                       if (rc_url_cmd[0] && num_urls)
+                               keyopt("<U>RLview ");
+                       if (has_images > 0 && strlen(imagecmd) > 0)
+                               keyopt("<I>mages ");
+                       keyopt("<?>help -> ");
+
                        do {
                                lines_printed = 2;
-                               e=(inkey()&127); e=tolower(e);
-/* return key same as <N> */   if (e==13) 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=='c')) e=0;
-                                       }
-/* 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'));
-                       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 'c':       printf("Copy\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;
-                               case 'f':       printf("File\r");       break;
-                               case 'u':       printf("URL's\r");      break;
-                               case '?':       printf("? <help>\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("\r%79s\r","");
-                       else
-                               printf("\n");
-                       fflush(stdout);
-                       }
-               switch(e) {
-                  case '?':    printf("Options available here:\n");
-                               printf(" ?  Help (prints this message)\n");
-                               printf(" S  Stop reading immediately\n");
-                               printf(" A  Again (repeats last message)\n");
-                               printf(" N  Next (continue with next message)\n");
-                               printf(" B  Back (go back to previous message)\n");
-                               if ((is_room_aide)
-                                   ||(room_flags&QR_MAILBOX)) {
-                                       printf(" D  Delete this message\n");
-                                       printf(" M  Move message to another room\n");
-                                       printf(" C  Copy message to another room\n");
-                                       }
-                               if (strlen(printcmd)>0)
-                                       printf(" P  Print this message\n");
-                               printf(" Q  Quote portions of this message for your next post\n");
-                               printf(" H  Headers (display message headers only)\n");
-                               if (is_mail)
-                                       printf(" R  Reply to this message\n");
-                               if (rc_allow_attachments)
-                                       printf(" F  (save attachments to a file)\n");
-                               if (strlen(rc_url_cmd)>0)
-                                       printf(" U  (list URL's for display)\n");
-                               printf("\n");
-                               goto RMSGREAD;
-                  case 'p':    fflush(stdout);
-                               freopen(prtfile,"w",stdout);
-                               arcflag = 1;
-                               hold_color = enable_color;
-                               enable_color = 0;
-                               goto RAGAIN;
-                  case 'q':    fflush(stdout);
-                               freopen(temp2,"w",stdout);
-                               quotflag = 1;
-                               hold_color = enable_color;
-                               enable_color = 0;
-                               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;
+                               if ((e == 'i')
+                                       && (!strlen(imagecmd) || !has_images))
+                                       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')
+                                && (e != 'i'));
+                       switch (e) {
+                       case 's':
+                               scr_printf("Stop");
                                break;
-                  case 'm':
-                  case 'c':
-                               newprompt("Enter target room: ",
-                                       targ,ROOMNAMELEN-1);
-                               if (strlen(targ)>0) {
-                                       sprintf(cmd,"MOVE %ld|%s|%d",
-                                               msg_arr[a],targ,
-                                               (e=='c' ? 1 : 0) );
-                                       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 '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 {
-                                       printf("%s\n",&cmd[4]);
-                                       }
-                               goto RMSGREAD;
-                  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 'h':    read_message(msg_arr[a],READ_HEADER);
-                               goto RMSGREAD;
-                  case 'r':    entmsg(1,(DEFAULT_ENTRY==46 ? 2 : 0));
+                       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 'f':
+                               scr_printf("File");
+                               break;
+                       case 'u':
+                               scr_printf("URL's");
+                               break;
+                       case 'y':
+                               scr_printf("mY next");
+                               break;
+                       case 'i':
+                               break;
+                       case '?':
+                               scr_printf("? <help>");
+                               break;
+                       }
+                       if (userflags & US_DISAPPEAR || e == 'i')
+                               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");
+                       if (strlen(imagecmd) > 0 && has_images > 0)
+                               scr_printf(" I  Image viewer\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) {
+                               r = CtdlIPCMoveMessage(ipc, (e == 'c' ? 1 : 0),
+                                                      msg_arr[a], targ, cmd);
+                               scr_printf("%s\n", cmd);
+                               if (r / 100 == 2)
+                                       msg_arr[a] = 0L;
+                       } else {
                                goto RMSGREAD;
-                  case 'u':    list_urls();
+                       }
+                       if (r / 100 != 2)       /* r will be init'ed, FIXME */
+                               goto RMSGREAD;  /* the logic here sucks */
+                       break;
+               case 'f':
+                       newprompt("Which section? ", filename,
+                                 ((sizeof filename) - 1));
+                       r = CtdlIPCAttachmentDownload(ipc, msg_arr[a],
+                                       filename, &attachment, progress, cmd);
+                       if (r / 100 != 2) {
+                               scr_printf("%s\n", cmd);
+                       } else {
+                               extract(filename, cmd, 2);
+                               /*
+                                * Part 1 won't have a filename; use the
+                                * subject of the message instead. IO
+                                */
+                               if (!strlen(filename))
+                                       strcpy(filename, reply_subject);
+                               destination_directory(save_to, filename);
+                               save_buffer(attachment,
+                                               extract_unsigned_long(cmd, 0),
+                                               save_to);
+                       }
+                       if (attachment) {
+                               free(attachment);
+                               attachment = NULL;
+                       }
+                       goto RMSGREAD;
+               case 'd':
+                       scr_printf("*** Delete this message? ");
+                       if (yesno() == 1) {
+                               r = CtdlIPCDeleteMessage(ipc, msg_arr[a], cmd);
+                               scr_printf("%s\n", cmd);
+                               if (r / 100 == 2)
+                                       msg_arr[a] = 0L;
+                       } else {
                                goto RMSGREAD;
                        }
-               } /* end for loop */
-       } /* end read routine */
+                       break;
+               case 'h':
+                       read_message(ipc, msg_arr[a], READ_HEADER, NULL);
+                       goto RMSGREAD;
+               case 'r':
+                       savedpos = num_msgs;
+                       entmsg(ipc, 1, (rc_reply_extedit ? 2 : 0));
+                       num_msgs = savedpos;
+                       goto RMSGREAD;
+               case 'u':
+                       list_urls(ipc);
+                       goto RMSGREAD;
+               case 'i':
+                       image_view(ipc, msg_arr[a]);
+                       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 repetitively 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;
+               struct ctdlipcmessage *msg = NULL;
+                
+               /* read the header so we can get 'from=' */
+               r = CtdlIPCGetSingleMessage(ipc, msg_arr[finda], 1, 0, &msg, buf);
+               if (!strncasecmp(msg->author, fullname, sizeof(fullname))) {
+                       a = lasta; /* meesa current */
+                       founda = 1;
+               }
+
+               free(msg);
+
+               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 */
 
 
 
@@ -1211,17 +1843,17 @@ RMSGREAD:       fflush(stdout);
 /*
  * View and edit a system message
  */
-void edit_system_message(char *which_message)
+void edit_system_message(CtdlIPC *ipc, char *which_message)
 {
-       char desc[64];
-       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);
-       do_edit(desc, read_cmd, "NOOP", write_cmd);
-       }
+       char desc[SIZ];
+       char read_cmd[SIZ];
+       char write_cmd[SIZ];
+
+       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(ipc, desc, read_cmd, "NOOP", write_cmd);
+}
 
 
 
@@ -1229,21 +1861,68 @@ void edit_system_message(char *which_message)
 /*
  * Verify the message base
  */
-void check_message_base(void) {
-       char buf[256];
-
-       printf("Please read the documentation before running this command.\n");
-       printf("Having done so, do you still want to check the message base? ");
-       if (yesno()==0) return;
+void check_message_base(CtdlIPC *ipc)
+{
+       char buf[SIZ];
+       char *transcript = NULL;
+       int r;          /* IPC response code */
+
+       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') {
-               printf("%s\n", &buf[4]);
+       r = CtdlIPCMessageBaseCheck(ipc, &transcript, buf);
+       if (r / 100 != 1) {
+               scr_printf("%s\n", buf);
                return;
        }
 
-       while (serv_gets(buf), strcmp(buf, "000")) {
-               printf("%s\n", buf);
+       while (transcript && strlen(transcript)) {
+               lines_printed = 1;
+               extract_token(buf, transcript, 0, '\n');
+               remove_token(transcript, 0, '\n');
+               pprintf("%s\n", buf);
        }
+       if (transcript) free(transcript);
+       return;
+}
+
+
+/*
+ * Loads the contents of a file into memory.  Caller must free the allocated
+ * memory.
+ */
+char *load_message_from_file(FILE *src)
+{
+       size_t i;
+       size_t got = 0;
+       char *dest = NULL;
+
+       fseek(src, 0, SEEK_END);
+       i = ftell(src);
+       rewind(src);
+
+       dest = (char *)calloc(1, i + 1);
+       if (!dest)
+               return NULL;
+
+       while (got < i) {
+               size_t g;
+
+               g = fread(dest + got, 1, i - got, src);
+               got += g;
+               if (g < i - got) {
+                       /* Interrupted system call, keep going */
+                       if (errno == EINTR)
+                               continue;
+                       /* At this point we have either EOF or error */
+                       i = got;
+                       break;
+               }
+               dest[i] = 0;
+       }
+
+       return dest;
 }