#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 SIZ
-#define MAXMSGS 512
+#define NO_REPLY_TO "nobody ... xxxxxx"
+
+char reply_to[SIZ];
+char reply_subject[SIZ];
struct cittext {
struct cittext *next;
};
void sttybbs(int cmd);
-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(unsigned long curr, unsigned long cmax);
-char reply_to[SIZ];
-char reply_subject[SIZ];
-long msg_arr[MAXMSGS];
+unsigned long *msg_arr = NULL;
+int msg_arr_size = 0;
int num_msgs;
char rc_alt_semantics;
extern char room_name[];
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 */
void ka_sigcatch(int signum)
{
- char buf[SIZ];
alarm(S_KEEPALIVE);
signal(SIGALRM, ka_sigcatch);
- serv_puts("NOOP");
- serv_gets(buf);
+ CtdlIPCNoop(ipc_for_signal_handlers);
}
/*
* 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 appending = 0;
scr_putc(32);
scr_putc(8);
}
+ } 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)
/* Read a message from the server
*/
-int read_message(
+int read_message(CtdlIPC *ipc,
long num, /* message number */
- char pagin, /* 0 = normal read, 1 = read with pagination, 2 = header */
+ int pagin, /* 0 = normal read, 1 = read with pagination, 2 = header */
FILE *dest) /* Destination file, NULL for screen */
{
char buf[SIZ];
- char m_subject[SIZ];
- char from[SIZ], node[SIZ], rfca[SIZ];
char now[SIZ];
int format_type = 0;
int fr = 0;
int nhdr = 0;
+ struct ctdlipcmessage *message = NULL;
+ int r; /* IPC response code */
+ char *converted_text = NULL;
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') {
- err_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);
return (0);
}
- strcpy(m_subject, "");
- strcpy(reply_to, "nobody ... xxxxx");
- strcpy(from, "");
- strcpy(node, "");
- strcpy(rfca, "");
-
if (dest) {
fprintf(dest, "\n ");
} else {
color(BRIGHT_CYAN);
}
+ /* View headers only */
if (pagin == 2) {
- while (serv_gets(buf), strcmp(buf, "000")) {
- if (buf[4] == '=') {
- if (dest) {
- fprintf(dest, "%s\n", buf);
- } else {
- scr_printf("%s\n", buf);
- ++lines_printed;
- lines_printed =
- checkpagin(lines_printed,
- pagin, screenheight);
- }
+ sprintf(buf, "nhdr=%s\nfrom=%s\ntype=%d\nmsgn=%s\n",
+ message->nhdr ? "yes" : "no",
+ message->author, message->type,
+ message->msgid);
+ /* FIXME output buf */
+ if (strlen(message->subject)) {
+ sprintf(buf, "subj=%s\n", message->subject);
+ /* FIXME: output buf */
+ }
+ if (strlen(message->email)) {
+ sprintf(buf, "rfca=%s\n", message->email);
+ /* FIXME: output buf */
+ }
+ sprintf(buf, "hnod=%s\nroom=%s\nnode=%s\ntime=%s",
+ message->hnod, message->room,
+ message->node,
+ asctime(localtime(&message->time)));
+ if (strlen(message->recipient)) {
+ sprintf(buf, "rcpt=%s\n", message->recipient);
+ /* FIXME: output buf */
+ }
+ if (message->attachments) {
+ struct parts *ptr;
+
+ for (ptr = message->attachments; ptr; ptr = ptr->next) {
+ sprintf(buf, "part=%s|%s|%s|%s|%s|%ld\n",
+ ptr->name, ptr->filename, ptr->number,
+ ptr->disposition, ptr->mimetype,
+ ptr->length);
+ /* FIXME: output buf */
}
}
sttybbs(0);
return (0);
}
- while (serv_gets(buf), strncasecmp(buf, "text", 4)) {
- if (!strncasecmp(buf, "nhdr=yes", 8))
- nhdr = 1;
- if (!strncasecmp(buf, "from=", 5)) {
- strcpy(from, &buf[5]);
+ if (rc_display_message_numbers) {
+ if (dest) {
+ fprintf(dest, "[#%s] ", message->msgid);
+ } else {
+ color(DIM_WHITE);
+ scr_printf("[");
+ color(BRIGHT_WHITE);
+ scr_printf("#%s", message->msgid);
+ color(DIM_WHITE);
+ scr_printf("] ");
}
- if (nhdr == 1)
- buf[0] = '_';
-
- if (!strncasecmp(buf, "type=", 5))
- format_type = atoi(&buf[5]);
- else if ((!strncasecmp(buf, "msgn=", 5))
- && (rc_display_message_numbers)) {
- if (dest) {
- fprintf(dest, "[#%s] ", &buf[5]);
- } else {
- color(DIM_WHITE);
- scr_printf("[");
- color(BRIGHT_WHITE);
- scr_printf("#%s", &buf[5]);
- color(DIM_WHITE);
- scr_printf("] ");
- }
+ }
+ if (nhdr == 1 && !is_room_aide) {
+ if (dest) {
+ fprintf(dest, " ****");
+ } else {
+ scr_printf(" ****");
}
- else if (!strncasecmp(buf, "from=", 5)) {
- if (dest) {
- fprintf(dest, "from %s ", &buf[5]);
- } else {
- color(DIM_WHITE);
- scr_printf("from ");
- color(BRIGHT_CYAN);
- scr_printf("%s ", &buf[5]);
+ } 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);
}
- }
- else if (!strncasecmp(buf, "subj=", 5)) {
- strcpy(m_subject, &buf[5]);
- }
- else if (!strncasecmp(buf, "rfca=", 5)) {
- safestrncpy(rfca, &buf[5], sizeof(rfca) - 5);
- if (dest) {
- fprintf(dest, "<%s> ", &buf[5]);
- } else {
+ } else {
+ color(BRIGHT_CYAN);
+ scr_printf("%s ", now);
+ color(DIM_WHITE);
+ 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", &buf[5]);
- color(DIM_WHITE);
+ scr_printf("%s", message->email);
+ color(DIM_WHITE);
scr_printf("> ");
}
}
- else if ((!strncasecmp(buf, "hnod=", 5))
- && (strcasecmp(&buf[5], serv_info.serv_humannode))
- && (strlen(rfca) == 0)) {
- if (dest) {
- fprintf(dest, "(%s) ", &buf[5]);
- } else {
- color(DIM_WHITE);
- scr_printf("(");
- color(BRIGHT_WHITE);
- scr_printf("%s", &buf[5]);
- color(DIM_WHITE);
- scr_printf(") ");
- }
- }
- else if ((!strncasecmp(buf, "room=", 5))
- && (strcasecmp(&buf[5], room_name))
- && (strlen(rfca) == 0)) {
- if (dest) {
- fprintf(dest, "in %s> ", &buf[5]);
- } else {
- color(DIM_WHITE);
- scr_printf("in ");
- color(BRIGHT_MAGENTA);
- scr_printf("%s> ", &buf[5]);
- }
- }
- else if (!strncasecmp(buf, "node=", 5)) {
- safestrncpy(node, &buf[5], sizeof(buf) - 5);
+ if (strlen(message->node)) {
if ((room_flags & QR_NETWORK)
- ||
- ((strcasecmp
- (&buf[5], serv_info.serv_nodename)
- &&
- (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
- {
- if (strlen(rfca) == 0) {
+ || ((strcasecmp(message->node, serv_info.serv_nodename)
+ && (strcasecmp(message->node, serv_info.serv_fqdn))))) {
+ if (strlen(message->email) == 0) {
if (dest) {
- fprintf(dest, "@%s ", &buf[5]);
+ fprintf(dest, "@%s ", message->node);
} else {
color(DIM_WHITE);
scr_printf("@");
color(BRIGHT_YELLOW);
- scr_printf("%s ", &buf[5]);
+ scr_printf("%s ", message->node);
}
}
}
}
- else if (!strncasecmp(buf, "rcpt=", 5)) {
+ if (strcasecmp(message->hnod, serv_info.serv_humannode)
+ && (strlen(message->hnod)) && (!strlen(message->email))) {
if (dest) {
- fprintf(dest, "to %s ", &buf[5]);
+ fprintf(dest, "(%s) ", message->hnod);
} else {
color(DIM_WHITE);
- scr_printf("to ");
- color(BRIGHT_CYAN);
- scr_printf("%s ", &buf[5]);
+ scr_printf("(");
+ color(BRIGHT_WHITE);
+ scr_printf("%s", message->hnod);
+ color(DIM_WHITE);
+ scr_printf(") ");
}
}
- else if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(now, atol(&buf[5]), 0);
+ if (strcasecmp(message->room, room_name) && (strlen(message->email) == 0)) {
if (dest) {
- fprintf(dest, "%s ", now);
+ fprintf(dest, "in %s> ", message->room);
} else {
- scr_printf("%s ", now);
+ color(DIM_WHITE);
+ scr_printf("in ");
+ color(BRIGHT_MAGENTA);
+ scr_printf("%s> ", message->room);
}
}
- }
-
- if (nhdr == 1) {
- if (!is_room_aide) {
- if (dest) {
- fprintf(dest, " ****");
- } else {
- scr_printf(" ****");
- }
- } else {
+ if (strlen(message->recipient)) {
if (dest) {
- fprintf(dest, " %s", from);
+ fprintf(dest, "to %s ", message->recipient);
} else {
- scr_printf(" %s", from);
+ color(DIM_WHITE);
+ scr_printf("to ");
+ color(BRIGHT_CYAN);
+ scr_printf("%s ", message->recipient);
}
}
}
+
if (dest) {
fprintf(dest, "\n");
} else {
scr_printf("\n");
}
- if (strlen(rfca) > 0) {
- strcpy(reply_to, rfca);
- } else {
- snprintf(reply_to, sizeof(reply_to), "%s @ %s", from,
- node);
+ /* 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 (pagin == 1 && !dest)
lines_printed = checkpagin(lines_printed, pagin, screenheight);
}
- strcpy(reply_subject, m_subject);
- if (strlen(m_subject) > 0) {
- if (dest) {
- fprintf(dest, "Subject: %s\n", m_subject);
- } else {
- scr_printf("Subject: %s\n", m_subject);
- ++lines_printed;
- lines_printed = checkpagin(lines_printed,
- pagin, screenheight);
+ if (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 {
+ scr_printf("Subject: %s\n", message->subject);
+ ++lines_printed;
+ lines_printed = checkpagin(lines_printed,
+ pagin, screenheight);
+ }
+ }
+ }
+
+ /******* 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;
}
}
+ /*
+ * Here we go
+ */
if (format_type == 0) {
- fr = fmout(screenwidth, NULL, dest,
+ fr = fmout(screenwidth, NULL, message->text, dest,
((pagin == 1) ? 1 : 0), screenheight, (-1), 1);
} else {
- while (serv_gets(buf), strcmp(buf, "000")) {
+ char *msgtext;
+ char *lineptr;
+
+ msgtext = message->text;
+
+ while (lineptr = strtok(msgtext, "\n"), lineptr != NULL) {
+ msgtext = NULL;
+
if (sigcaught == 0) {
if (dest) {
- fprintf(dest, "%s\n", buf);
+ fprintf(dest, "%s\n", lineptr);
} else {
- scr_printf("%s\n", buf);
+ scr_printf("%s\n", lineptr);
lines_printed = lines_printed + 1 +
- (strlen(buf) / screenwidth);
+ (strlen(lineptr) / screenwidth);
lines_printed =
checkpagin(lines_printed, pagin,
screenheight);
fprintf(dest, "\n");
} else {
scr_printf("\n");
- scr_flush();
+ /* scr_flush(); */
++lines_printed;
lines_printed = checkpagin(lines_printed, pagin, screenheight);
}
+ /* 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);
+ scr_printf("Part ");
+ color(BRIGHT_MAGENTA);
+ scr_printf("%s", ptr->number);
+ color(DIM_WHITE);
+ scr_printf(": ");
+ color(BRIGHT_CYAN);
+ scr_printf("%s", ptr->filename);
+ color(DIM_WHITE);
+ scr_printf(" (%s, %ld bytes)\n", ptr->mimetype, ptr->length);
+ }
+ }
+ }
+
+ /* Now we're done */
+ free(message->text);
+ free(message);
+
if (pagin == 1 && !dest)
color(DIM_WHITE);
sttybbs(0);
long msglen = 0L;
scr_printf("Enter text to be replaced:\n: ");
- getline(srch_str, 128);
+ 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, 128);
+ getline(rplc_str, (sizeof(rplc_str)-1) );
fp = fopen(filename, "r+");
if (fp == NULL)
buf[strlen(buf)] = a;
if (strlen(buf) >= strlen(srch_str)) {
ptr = (&buf[strlen(buf) - strlen(srch_str)]);
- if (!strncasecmp(ptr, srch_str, strlen(srch_str))) {
+ if (!strncmp(ptr, srch_str, strlen(srch_str))) {
strcpy(ptr, rplc_str);
++substitutions;
}
/*
* Function to begin composing a new message
*/
-int client_make_message(char *filename, /* temporary file name */
+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 format_type,
mode = 0;
}
- fmt_date(datestr, time(NULL), 0);
+ fmt_date(datestr, sizeof datestr, time(NULL), 0);
header[0] = 0;
if (room_flags & QR_ANONONLY && !recipient) {
- sprintf(&header[strlen(header)], " ****");
+ snprintf(header, sizeof header, " ****");
}
else {
- sprintf(&header[strlen(header)],
+ snprintf(header, sizeof header,
" %s from %s", datestr, fullname);
if (strlen(recipient) > 0) {
- sprintf(&header[strlen(header)],
+ size_t tmp = strlen(header);
+ snprintf(&header[tmp], sizeof header - tmp,
" to %s", recipient);
}
}
if (mode == 0) {
fp = fopen(filename, "r");
if (fp != NULL) {
- fmout(screenwidth, fp, NULL, 0, screenheight, 0, 0);
+ fmout(screenwidth, fp, NULL, NULL, 0, screenheight, 0, 0);
beg = ftell(fp);
fclose(fp);
} else {
filename, strerror(errno));
return(1);
}
- citedit(fp);
+ citedit(ipc, fp);
fclose(fp);
goto MECR;
editor_pid = fork();
cksum = file_checksum(filename);
if (editor_pid == 0) {
+ char tmp[SIZ];
+
chmod(filename, 0600);
screen_reset();
sttybbs(SB_RESTORE);
- setenv("WINDOW_TITLE", header, 1);
+ snprintf(tmp, sizeof tmp, "WINDOW_TITLE=%s", header);
+ putenv(tmp);
execlp(editor_path, editor_path, filename, NULL);
exit(1);
}
}
fp = fopen(filename, "r");
if (fp != NULL) {
- fmout(screenwidth, fp, NULL,
+ fmout(screenwidth, fp, NULL, NULL,
((userflags & US_PAGINATOR) ? 1 : 0),
screenheight, 0, 0);
beg = ftell(fp);
* 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[SIZ];
int ch, a;
if (ch == 10) {
if (!strcmp(buf, "000"))
strcpy(buf, ">000");
- serv_puts(buf);
+ CtdlIPC_putline(ipc, buf);
strcpy(buf, "");
} else {
a = strlen(buf);
buf[a] = 0;
if (!strcmp(buf, "000"))
strcpy(buf, ">000");
- serv_puts(buf);
+ CtdlIPC_putline(ipc, buf);
strcpy(buf, "");
}
if (strlen(buf) > 250) {
if (!strcmp(buf, "000"))
strcpy(buf, ">000");
- serv_puts(buf);
+ CtdlIPC_putline(ipc, buf);
strcpy(buf, "");
}
}
}
}
- serv_puts(buf);
+ CtdlIPC_putline(ipc, buf);
scr_printf(" \r");
scr_flush();
}
+/*
+ * 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) );
+ }
+}
+
/*
* entmsg() - edit and create a message
* returns 0 if message was saved
*/
-int entmsg(int is_reply, /* nonzero if this was a <R>eply command */
+int entmsg(CtdlIPC *ipc,
+ int is_reply, /* nonzero if this was a <R>eply command */
int c) /* */
{
char buf[300];
int a, b;
int need_recp = 0;
int mode;
- long highmsg;
+ long highmsg = 0L;
FILE *fp;
char subject[SIZ];
* 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.
*/
- sprintf(cmd, "ENT0 0||0|%d", mode);
- serv_puts(cmd);
- serv_gets(cmd);
+ snprintf(cmd, sizeof cmd, "ENT0 0||0|%d", mode);
+ CtdlIPC_putline(ipc, cmd);
+ CtdlIPC_getline(ipc, cmd);
if ((strncmp(cmd, "570", 3)) && (strncmp(cmd, "200", 3))) {
scr_printf("%s\n", &cmd[4]);
/* If the user is a dumbass, tell them how to type. */
if ((userflags & US_EXPERT) == 0) {
- formout("entermsg");
+ formout(ipc, "entermsg");
}
/* Handle the selection of a recipient, if necessary. */
/* 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|%s", buf, b, mode, subject);
- serv_puts(cmd);
- serv_gets(cmd);
+ snprintf(cmd, sizeof cmd, "ENT0 0|%s|%d|%d|%s", buf, b, mode, subject);
+ CtdlIPC_putline(ipc, cmd);
+ CtdlIPC_getline(ipc, cmd);
if (cmd[0] != '2') {
scr_printf("%s\n", &cmd[4]);
return (1);
* tell upon saving whether someone else has posted too.
*/
num_msgs = 0;
- serv_puts("MSGS LAST|1");
- serv_gets(cmd);
+ CtdlIPC_putline(ipc, "MSGS LAST|1");
+ CtdlIPC_getline(ipc, cmd);
if (cmd[0] != '1') {
scr_printf("%s\n", &cmd[5]);
} else {
- while (serv_gets(cmd), strcmp(cmd, "000")) {
+ while (CtdlIPC_getline(ipc, cmd), strcmp(cmd, "000")) {
+ check_msg_arr_size();
msg_arr[num_msgs++] = atol(cmd);
}
}
/* Now compose the message... */
- if (client_make_message(temp, buf, b, 0, c, subject) != 0) {
+ if (client_make_message(ipc, temp, buf, b, 0, c, subject) != 0) {
return (2);
}
}
/* Transmit message to the server */
- sprintf(cmd, "ENT0 1|%s|%d|%d|%s|", buf, b, mode, subject);
- serv_puts(cmd);
- serv_gets(cmd);
+ snprintf(cmd, sizeof cmd, "ENT0 1|%s|%d|%d|%s|", buf, b, mode, subject);
+ CtdlIPC_putline(ipc, cmd);
+ CtdlIPC_getline(ipc, cmd);
if (cmd[0] != '4') {
scr_printf("%s\n", &cmd[4]);
return (1);
}
- transmit_message(fp);
- serv_puts("000");
+ transmit_message(ipc, fp);
+ CtdlIPC_putline(ipc, "000");
fclose(fp);
- highmsg = msg_arr[num_msgs - 1];
+ if (num_msgs >= 1) highmsg = msg_arr[num_msgs - 1];
num_msgs = 0;
- serv_puts("MSGS NEW");
- serv_gets(cmd);
+ CtdlIPC_putline(ipc, "MSGS NEW");
+ CtdlIPC_getline(ipc, cmd);
if (cmd[0] != '1') {
scr_printf("%s\n", &cmd[5]);
} else {
- while (serv_gets(cmd), strcmp(cmd, "000")) {
+ while (CtdlIPC_getline(ipc, cmd), strcmp(cmd, "000")) {
+ check_msg_arr_size();
msg_arr[num_msgs++] = atol(cmd);
}
}
/*
* List the URL's which were embedded in the previous message
*/
-void list_urls()
+void list_urls(CtdlIPC *ipc)
{
int i;
char cmd[SIZ];
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);
scr_printf("\n");
}
/*
* Read the messages in the current room
*/
-void readmsgs(
+void readmsgs(CtdlIPC *ipc,
int c, /* 0=Read all 1=Read new 2=Read old 3=Read last q */
int rdir, /* 1=Forward (-1)=Reverse */
int q /* Number of msgs to read (if c==3) */
char pagin;
char cmd[SIZ];
char targ[ROOMNAMELEN];
- char filename[SIZ];
+ 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 = (MAXMSGS - 1);
+ b = (num_msgs - 1);
else
b = 0;
strcat(cmd, "OLD");
break;
case 3:
- sprintf(&cmd[strlen(cmd)], "LAST|%d", q);
+ snprintf(&cmd[5], sizeof cmd - 5, "LAST|%d", q);
break;
}
- serv_puts(cmd);
- serv_gets(cmd);
+ CtdlIPC_putline(ipc, cmd);
+ CtdlIPC_getline(ipc, cmd);
if (cmd[0] != '1') {
scr_printf("%s\n", &cmd[5]);
} else {
- while (serv_gets(cmd), strcmp(cmd, "000")) {
- if (num_msgs == MAXMSGS) {
- memcpy(&msg_arr[0], &msg_arr[1],
- (sizeof(long) * (MAXMSGS - 1)));
- --num_msgs;
- }
+ while (CtdlIPC_getline(ipc, cmd), strcmp(cmd, "000")) {
+ check_msg_arr_size();
msg_arr[num_msgs++] = atol(cmd);
}
}
for (a = start; ((a < num_msgs) && (a >= 0)); a = a + rdir) {
while (msg_arr[a] == 0L) {
a = a + rdir;
- if ((a == MAXMSGS) || (a == (-1)))
+ if ((a == num_msgs) || (a == (-1)))
return;
}
}
/* now read the message... */
- e = read_message(msg_arr[a], pagin, dest);
+ e = read_message(ipc, msg_arr[a], pagin, dest);
/* ...and set the screenwidth back if we have to */
if ((quotflag) || (arcflag)) {
if (rc_alt_semantics && c == 1) {
char buf[SIZ];
- snprintf(buf, sizeof(buf), "SEEN %ld", msg_arr[a]);
- serv_puts(buf);
- serv_gets(buf); /* Don't need to check this? */
+ r = CtdlIPCSetMessageSeen(ipc, msg_arr[a], 1, buf);
}
if (e == 3)
return;
lines_printed = 2;
e = (inkey() & 127);
e = tolower(e);
-/* return key same as <N> */ if (e == 13)
+/* return key same as <N> */ if (e == 10)
e = 'n';
/* space key same as <N> */ if (e == 32)
e = 'n';
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);
- scr_printf("%s\n", &cmd[4]);
- if (cmd[0] == '2')
+ 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;
}
- if (cmd[0] != '2')
- goto RMSGREAD;
+ 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));
- 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));
+ r = CtdlIPCAttachmentDownload(ipc, msg_arr[a],
+ filename, &attachment, progress, cmd);
+ extract(filename, cmd, 2);
+ destination_directory(save_to, filename);
+ r = CtdlIPCAttachmentDownload(ipc, msg_arr[a],
+ filename, &attachment, progress, cmd);
+ if (r / 100 != 2) {
+ scr_printf("%s\n", cmd);
} else {
- scr_printf("%s\n", &cmd[4]);
+ save_buffer(attachment,
+ extract_unsigned_long(cmd, 0),
+ save_to);
}
+ if (attachment) free(attachment);
goto RMSGREAD;
case 'd':
scr_printf("*** Delete this message? ");
if (yesno() == 1) {
- sprintf(cmd, "DELE %ld", msg_arr[a]);
- serv_puts(cmd);
- serv_gets(cmd);
- scr_printf("%s\n", &cmd[4]);
- if (cmd[0] == '2')
+ r = CtdlIPCDeleteMessage(ipc, msg_arr[a], cmd);
+ scr_printf("%s\n", cmd);
+ if (r / 100 == 2)
msg_arr[a] = 0L;
} else {
goto RMSGREAD;
}
break;
case 'h':
- read_message(msg_arr[a], READ_HEADER, NULL);
+ read_message(ipc, msg_arr[a], READ_HEADER, NULL);
goto RMSGREAD;
case 'r':
savedpos = num_msgs;
- entmsg(1, (DEFAULT_ENTRY == 46 ? 2 : 0));
+ entmsg(ipc, 1, (DEFAULT_ENTRY == 46 ? 2 : 0));
num_msgs = savedpos;
goto RMSGREAD;
case 'u':
- list_urls();
+ list_urls(ipc);
goto RMSGREAD;
case 'y':
{ /* hack hack hack */
int lasta = a;
for (finda = a; ((finda < num_msgs) && (finda >= 0)); finda += rdir)
{
- /* this is repetitivly dumb, but that's what computers are for.
+ /* 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;
- sprintf(buf, "MSG0 %ld|%d", msg_arr[finda], 1); /* read the header so we can get 'from=' */
- serv_puts(buf);
- serv_gets(buf);
- while (serv_gets(buf), strcmp(buf, "000"))
+ snprintf(buf, sizeof buf, "MSG0 %ld|1", msg_arr[finda]); /* read the header so we can get 'from=' */
+ CtdlIPC_putline(ipc, buf);
+ CtdlIPC_getline(ipc, buf);
+ while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000"))
{
if ((!strncasecmp(buf, "from=", 5)) && (finda != a)) /* Skip current message. */
{
char read_cmd[64];
char write_cmd[64];
- sprintf(desc, "system message '%s'", which_message);
- sprintf(read_cmd, "MESG %s", which_message);
- sprintf(write_cmd, "EMSG %s", which_message);
+ snprintf(desc, sizeof desc, "system message '%s'", which_message);
+ snprintf(read_cmd, sizeof read_cmd, "MESG %s", which_message);
+ snprintf(write_cmd, sizeof write_cmd, "EMSG %s", which_message);
do_edit(desc, read_cmd, "NOOP", write_cmd);
}
/*
* Verify the message base
*/
-void check_message_base(void)
+void check_message_base(CtdlIPC *ipc)
{
char buf[SIZ];
if (yesno() == 0)
return;
- serv_puts("FSCK");
- serv_gets(buf);
+ CtdlIPC_putline(ipc, "FSCK");
+ CtdlIPC_getline(ipc, buf);
if (buf[0] != '1') {
scr_printf("%s\n", &buf[4]);
return;
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
scr_printf("%s\n", buf);
}
}
projects / citadel.git / blobdiff