#include <ctype.h>
#include <string.h>
#include <syslog.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#include <limits.h>
-#include "citadel.h"
-#include "server.h"
#include <errno.h>
+#include <stdarg.h>
#include <sys/stat.h>
+#include "citadel.h"
+#include "server.h"
#include "database.h"
#include "msgbase.h"
#include "support.h"
#define msg_repl ((struct repl *)CtdlGetUserData(SYM_REPL))
extern struct config config;
+long config_msgnum;
char *msgkeys[] = {
"", "", "", "", "", "", "", "",
"path",
"",
"rcpt",
- "",
+ "spec",
"time",
"subj",
"",
* for here is to format text out to 80 columns before sending it
* to the client. The client software may reformat it again.
*/
-void memfmout(int width, char *mptr, char subst)
- /* screen width to use */
- /* where are we going to get our text from? */
- /* nonzero if we should use hypertext mode */
+void memfmout(
+ int width, /* screen width to use */
+ char *mptr, /* where are we going to get our text from? */
+ char subst) /* nonzero if we should do substitutions */
{
int a, b, c;
int real = 0;
}
-/*
- * Callback function for mime parser that wants to display text
- */
-void fixed_output(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length)
-{
- char *ptr;
-
- if (!strcasecmp(cbtype, "multipart/alternative")) {
- strcpy(ma->prefix, partnum);
- strcat(ma->prefix, ".");
- ma->is_ma = 1;
- ma->did_print = 0;
- return;
- }
-
- if ( (!strncasecmp(partnum, ma->prefix, strlen(ma->prefix)))
- && (ma->is_ma == 1)
- && (ma->did_print == 1) ) {
- lprintf(9, "Skipping part %s (%s)\n", partnum, cbtype);
- return;
- }
-
- ma->did_print = 1;
-
- if (!strcasecmp(cbtype, "text/plain")) {
- client_write(content, length);
- }
- else if (!strcasecmp(cbtype, "text/html")) {
- ptr = html_to_ascii(content, 80, 0);
- client_write(ptr, strlen(ptr));
- phree(ptr);
- }
- else if (strncasecmp(cbtype, "multipart/", 10)) {
- cprintf("Part %s: %s (%s) (%d bytes)\n",
- partnum, filename, cbtype, length);
- }
-}
-
-
/*
* Callback function for mime parser that opens a section for downloading
*/
/*
* Load a message from disk into memory.
- * This is used by output_message() and other fetch functions.
+ * This is used by CtdlOutputMsg() and other fetch functions.
*
* NOTE: Caller is responsible for freeing the returned CtdlMessage struct
* using the CtdlMessageFree() function.
CIT_UBYTE field_header;
size_t field_length;
-
dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
if (dmsgtext == NULL) {
return NULL;
cdb_free(dmsgtext);
+ /* Always make sure there's something in the msg text field */
+ if (ret->cm_fields['M'] == NULL)
+ ret->cm_fields['M'] = strdoop("<no text>\n");
+
/* Perform "before read" hooks (aborting if any return nonzero) */
if (PerformMessageHooks(ret, EVT_BEFOREREAD) > 0) {
CtdlFreeMessage(ret);
}
-
/*
* Get a message off disk. (return value is the message's timestamp)
*
*/
-void output_message(char *msgid, int mode, int headers_only)
-{
- long msg_num;
+int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */
+ int mode, /* how would you like that message? */
+ int headers_only, /* eschew the message body? */
+ int do_proto, /* do Citadel protocol responses? */
+ FILE *outfp,
+ int outsock,
+ int crlf /* Use CRLF newlines instead of LF? */
+) {
int a, i, k;
char buf[1024];
time_t xtime;
CIT_UBYTE ch;
char allkeys[256];
char display_name[256];
-
- struct CtdlMessage *TheMessage = NULL;
-
+ struct CtdlMessage *TheMessage;
char *mptr;
+ char *nl; /* newline string */
/* buffers needed for RFC822 translation */
char suser[256];
char mid[256];
/* */
- msg_num = atol(msgid);
+
+ /* BEGIN NESTED FUNCTION omprintf() */
+ void omprintf(const char *format, ...) {
+ va_list arg_ptr;
+ char buf[256];
+
+ va_start(arg_ptr, format);
+ if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
+ buf[sizeof buf - 2] = '\n';
+ if (outfp != NULL) {
+ fwrite(buf, strlen(buf), 1, outfp);
+ }
+ else if (outsock >= 0) {
+ write(outsock, buf, strlen(buf));
+ }
+ else {
+ client_write(buf, strlen(buf));
+ }
+ va_end(arg_ptr);
+ }
+ /* END NESTED FUNCTION omprintf() */
+
+ /* BEGIN NESTED FUNCTION omfmout() */
+ void omfmout(char *mptr) {
+ int b, c;
+ int real = 0;
+ int old = 0;
+ CIT_UBYTE ch;
+ char aaa[140];
+ char buffer[256];
+
+ strcpy(aaa, "");
+ old = 255;
+ strcpy(buffer, "");
+ c = 1; /* c is the current pos */
+
+FMTA: ch = *mptr++;
+ old = real;
+ real = ch;
+ if (ch <= 0)
+ goto FMTEND;
+
+ if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
+ ch = 32;
+ if (((old == 13) || (old == 10)) && (isspace(real))) {
+ omprintf("%s", nl);
+ c = 1;
+ }
+ if (ch > 126)
+ goto FMTA;
+
+ if (ch > 32) {
+ if (((strlen(aaa) + c) > (75)) && (strlen(aaa) > (75))) {
+ omprintf("%s%s", nl, aaa);
+ c = strlen(aaa);
+ aaa[0] = 0;
+ }
+ b = strlen(aaa);
+ aaa[b] = ch;
+ aaa[b + 1] = 0;
+ }
+ if (ch == 32) {
+ if ((strlen(aaa) + c) > (75)) {
+ omprintf("%s", nl);
+ c = 1;
+ }
+ omprintf("%s ", aaa);
+ ++c;
+ c = c + strlen(aaa);
+ strcpy(aaa, "");
+ goto FMTA;
+ }
+ if ((ch == 13) || (ch == 10)) {
+ omprintf("%s%s", aaa, nl);
+ c = 1;
+ strcpy(aaa, "");
+ goto FMTA;
+ }
+ goto FMTA;
+
+FMTEND: omprintf("%s%s", aaa, nl);
+ }
+ /* END NESTED FUNCTION omfmout() */
+
+ /* BEGIN NESTED FUNCTION fixed_output() */
+ /*
+ * Callback function for mime parser that wants to display text
+ */
+ void fixed_output(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length)
+ {
+ char *ptr;
+ char *wptr;
+ size_t wlen;
+
+ if (!strcasecmp(cbtype, "multipart/alternative")) {
+ strcpy(ma->prefix, partnum);
+ strcat(ma->prefix, ".");
+ ma->is_ma = 1;
+ ma->did_print = 0;
+ return;
+ }
+
+ if ( (!strncasecmp(partnum, ma->prefix, strlen(ma->prefix)))
+ && (ma->is_ma == 1)
+ && (ma->did_print == 1) ) {
+ lprintf(9, "Skipping part %s (%s)\n", partnum, cbtype);
+ return;
+ }
+
+ ma->did_print = 1;
+
+ if (!strcasecmp(cbtype, "text/plain")) {
+ wlen = length;
+ wptr = content;
+ while (wlen--) {
+ ch = *wptr++;
+ if (ch==10) omprintf("%s", nl);
+ else omprintf("%c", ch);
+ }
+ }
+ else if (!strcasecmp(cbtype, "text/html")) {
+ ptr = html_to_ascii(content, 80, 0);
+ wlen = strlen(ptr);
+ wptr = ptr;
+ while (wlen--) {
+ ch = *wptr++;
+ if (ch==10) omprintf("%s", nl);
+ else omprintf("%c", ch);
+ }
+ phree(ptr);
+ }
+ else if (strncasecmp(cbtype, "multipart/", 10)) {
+ omprintf("Part %s: %s (%s) (%d bytes)%s",
+ partnum, filename, cbtype, length, nl);
+ }
+ }
+
+ /* END NESTED FUNCTION fixed_output() */
+
+
+ TheMessage = NULL;
+ sprintf(mid, "%ld", msg_num);
+ nl = (crlf ? "\r\n" : "\n");
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
+ if (do_proto) cprintf("%d Not logged in.\n",
+ ERROR + NOT_LOGGED_IN);
+ return(om_not_logged_in);
}
/* FIX ... small security issue
* broken production code with nonbroken pre-beta code. :( -- ajc
*
if (!msg_ok) {
- cprintf("%d Message %ld is not in this room.\n",
+ if (do_proto) cprintf("%d Message %ld is not in this room.\n",
ERROR, msg_num);
- return;
+ return(om_no_such_msg);
}
*/
*/
TheMessage = CtdlFetchMessage(msg_num);
if (TheMessage == NULL) {
- cprintf("%d Can't locate msg %ld on disk\n", ERROR, msg_num);
- return;
+ if (do_proto) cprintf("%d Can't locate msg %ld on disk\n",
+ ERROR, msg_num);
+ return(om_no_such_msg);
}
/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
- if (TheMessage->cm_format_type != 4) {
- cprintf("%d This is not a MIME message.\n",
+ if (TheMessage->cm_format_type != FMT_RFC822) {
+ if (do_proto)
+ cprintf("%d This is not a MIME message.\n",
ERROR);
} else if (CC->download_fp != NULL) {
- cprintf("%d You already have a download open.\n",
+ if (do_proto) cprintf(
+ "%d You already have a download open.\n",
ERROR);
} else {
/* Parse the message text component */
* section wasn't found, so print an error
*/
if (CC->download_fp == NULL) {
- cprintf("%d Section %s not found.\n",
+ if (do_proto) cprintf(
+ "%d Section %s not found.\n",
ERROR + FILE_NOT_FOUND,
desired_section);
}
}
CtdlFreeMessage(TheMessage);
- return;
+ return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
/* now for the user-mode message reading loops */
- cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
+ if (do_proto) cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
/* Tell the client which format type we're using. If this is a
* MIME message, *lie* about it and tell the user it's fixed-format.
*/
if (mode == MT_CITADEL) {
- if (TheMessage->cm_format_type == 4)
- cprintf("type=1\n");
- else
- cprintf("type=%d\n", TheMessage->cm_format_type);
+ if (TheMessage->cm_format_type == FMT_RFC822) {
+ if (do_proto) cprintf("type=1\n");
+ }
+ else {
+ if (do_proto) cprintf("type=%d\n",
+ TheMessage->cm_format_type);
+ }
}
/* nhdr=yes means that we're only displaying headers, no body */
if ((TheMessage->cm_anon_type == MES_ANON) && (mode == MT_CITADEL)) {
- cprintf("nhdr=yes\n");
+ if (do_proto) cprintf("nhdr=yes\n");
}
/* begin header processing loop for Citadel message format */
if (k != 'M') {
if (TheMessage->cm_fields[k] != NULL) {
if (k == 'A') {
- cprintf("%s=%s\n",
+ if (do_proto) cprintf("%s=%s\n",
msgkeys[k],
display_name);
}
else {
- cprintf("%s=%s\n",
+ if (do_proto) cprintf("%s=%s\n",
msgkeys[k],
TheMessage->cm_fields[k]
);
if (i == 'A') {
strcpy(luser, mptr);
} else if (i == 'P') {
- cprintf("Path: %s\n", mptr);
+ omprintf("Path: %s%s", mptr, nl);
for (a = 0; a < strlen(mptr); ++a) {
if (mptr[a] == '!') {
strcpy(mptr, &mptr[a + 1]);
}
strcpy(suser, mptr);
} else if (i == 'U')
- cprintf("Subject: %s\n", mptr);
+ omprintf("Subject: %s%s", mptr, nl);
else if (i == 'I')
strcpy(mid, mptr);
else if (i == 'H')
strcpy(lnode, mptr);
else if (i == 'O')
- cprintf("X-Citadel-Room: %s\n", mptr);
+ omprintf("X-Citadel-Room: %s%s",
+ mptr, nl);
else if (i == 'N')
strcpy(snode, mptr);
else if (i == 'R')
- cprintf("To: %s\n", mptr);
+ omprintf("To: %s%s", mptr, nl);
else if (i == 'T') {
xtime = atol(mptr);
- cprintf("Date: %s", asctime(localtime(&xtime)));
+ omprintf("Date: %s", asctime(localtime(&xtime)));
}
}
}
if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
- cprintf("Message-ID: <%s@%s>\n", mid, snode);
+ omprintf("Message-ID: <%s@%s>%s", mid, snode, nl);
PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
- cprintf("From: %s@%s (%s)\n", suser, snode, luser);
- cprintf("Organization: %s\n", lnode);
+ omprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
+ omprintf("Organization: %s%s", lnode, nl);
}
/* end header processing loop ... at this point, we're in the text */
mptr = TheMessage->cm_fields['M'];
/* Tell the client about the MIME parts in this message */
- if (TheMessage->cm_format_type == 4) { /* legacy textual dump */
+ if (TheMessage->cm_format_type == FMT_RFC822) { /* legacy text dump */
if (mode == MT_CITADEL) {
mime_parser(mptr, NULL, *list_this_part);
}
else if (mode == MT_MIME) { /* list parts only */
mime_parser(mptr, NULL, *list_this_part);
- cprintf("000\n");
+ if (do_proto) cprintf("000\n");
CtdlFreeMessage(TheMessage);
- return;
+ return(om_ok);
}
}
if (headers_only) {
- cprintf("000\n");
+ if (do_proto) cprintf("000\n");
CtdlFreeMessage(TheMessage);
- return;
+ return(om_ok);
}
/* signify start of msg text */
if (mode == MT_CITADEL)
- cprintf("text\n");
- if ((mode == MT_RFC822) && (TheMessage->cm_format_type != 4))
- cprintf("\n");
+ if (do_proto) cprintf("text\n");
+ /* if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822)) { */
+ if (mode == MT_RFC822) {
+ omprintf("%s", nl);
+ }
/* If the format type on disk is 1 (fixed-format), then we want
* everything to be output completely literally ... regardless of
* what message transfer format is in use.
*/
- if (TheMessage->cm_format_type == 1) {
+ if (TheMessage->cm_format_type == FMT_FIXED) {
strcpy(buf, "");
while (ch = *mptr++, ch > 0) {
if (ch == 13)
ch = 10;
if ((ch == 10) || (strlen(buf) > 250)) {
- cprintf("%s\n", buf);
+ omprintf("%s%s", buf, nl);
strcpy(buf, "");
} else {
buf[strlen(buf) + 1] = 0;
}
}
if (strlen(buf) > 0)
- cprintf("%s\n", buf);
+ omprintf("%s%s", buf, nl);
}
/* If the message on disk is format 0 (Citadel vari-format), we
* for new paragraphs is correct and the client will reformat the
* message to the reader's screen width.
*/
- if (TheMessage->cm_format_type == 0) {
- memfmout(80, mptr, 0);
+ if (TheMessage->cm_format_type == FMT_CITADEL) {
+ omfmout(mptr);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
* this message is format 1 (fixed format), so the callback function
* we use will display those parts as-is.
*/
- if (TheMessage->cm_format_type == 4) {
+ if (TheMessage->cm_format_type == FMT_RFC822) {
CtdlAllocUserData(SYM_MA_INFO, sizeof(struct ma_info));
memset(ma, 0, sizeof(struct ma_info));
mime_parser(mptr, NULL, *fixed_output);
}
/* now we're done */
- cprintf("000\n");
+ if (do_proto) cprintf("000\n");
CtdlFreeMessage(TheMessage);
- return;
+ return(om_ok);
}
*/
void cmd_msg0(char *cmdbuf)
{
- char msgid[256];
+ long msgid;
int headers_only = 0;
- extract(msgid, cmdbuf, 0);
+ msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- output_message(msgid, MT_CITADEL, headers_only);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, NULL, -1, 0);
return;
}
*/
void cmd_msg2(char *cmdbuf)
{
- char msgid[256];
+ long msgid;
int headers_only = 0;
- extract(msgid, cmdbuf, 0);
+ msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- output_message(msgid, MT_RFC822, headers_only);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, NULL, -1, 1);
}
*/
void cmd_msg4(char *cmdbuf)
{
- char msgid[256];
-
- extract(msgid, cmdbuf, 0);
+ long msgid;
- output_message(msgid, MT_MIME, 0);
+ msgid = extract_long(cmdbuf, 0);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, NULL, -1, 0);
}
/*
*/
void cmd_opna(char *cmdbuf)
{
- char msgid[256];
+ long msgid;
CtdlAllocUserData(SYM_DESIRED_SECTION, 64);
- extract(msgid, cmdbuf, 0);
+ msgid = extract_long(cmdbuf, 0);
extract(desired_section, cmdbuf, 1);
- output_message(msgid, MT_DOWNLOAD, 0);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, NULL, -1, 1);
}
/*
* Save a message to disk
*/
-void CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
+long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
char *rec, /* Recipient (mail) */
char *force, /* force a particular room? */
int mailtype, /* local or remote type */
char content_type[256]; /* We have to learn this */
char recipient[256];
long newmsgid;
- char *mptr;
+ char *mptr = NULL;
struct usersupp userbuf;
int a;
struct SuppMsgInfo smi;
FILE *network_fp = NULL;
static int seqnum = 1;
+ struct CtdlMessage *imsg;
+ char *instr;
lprintf(9, "CtdlSaveMsg() called\n");
- if (is_valid_message(msg) == 0) return; /* self check */
+ if (is_valid_message(msg) == 0) return(-1); /* self check */
/* If this message has no timestamp, we take the liberty of
* giving it one, right now.
*/
if (msg->cm_fields['T'] == NULL) {
+ lprintf(9, "Generating timestamp\n");
sprintf(aaa, "%ld", time(NULL));
msg->cm_fields['T'] = strdoop(aaa);
}
/* If this message has no path, we generate one.
*/
if (msg->cm_fields['P'] == NULL) {
- msg->cm_fields['P'] = strdoop(msg->cm_fields['A']);
- for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
- if (isspace(msg->cm_fields['P'][a])) {
- msg->cm_fields['P'][a] = ' ';
+ lprintf(9, "Generating path\n");
+ if (msg->cm_fields['A'] != NULL) {
+ msg->cm_fields['P'] = strdoop(msg->cm_fields['A']);
+ for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
+ if (isspace(msg->cm_fields['P'][a])) {
+ msg->cm_fields['P'][a] = ' ';
+ }
}
}
+ else {
+ msg->cm_fields['P'] = strdoop("unknown");
+ }
}
strcpy(force_room, force);
strcpy(&recipient[a], &recipient[a + 1]);
/* Learn about what's inside, because it's what's inside that counts */
+ lprintf(9, "Learning what's inside\n");
+ if (msg->cm_fields['M'] == NULL) {
+ lprintf(1, "ERROR: attempt to save message with NULL body\n");
+ }
switch (msg->cm_format_type) {
case 0:
}
/* Goto the correct room */
+ lprintf(9, "Switching rooms\n");
strcpy(hold_rm, CC->quickroom.QRname);
strcpy(actual_rm, CC->quickroom.QRname);
/* If the user is a twit, move to the twit room for posting */
+ lprintf(9, "Handling twit stuff\n");
if (TWITDETECT) {
if (CC->usersupp.axlevel == 2) {
strcpy(hold_rm, actual_rm);
strcpy(actual_rm, force_room);
}
+ lprintf(9, "Possibly relocating\n");
if (strcasecmp(actual_rm, CC->quickroom.QRname))
getroom(&CC->quickroom, actual_rm);
/* Perform "before save" hooks (aborting if any return nonzero) */
- if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return;
+ lprintf(9, "Performing before-save hooks\n");
+ if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-1);
/* If this message has an Extended ID, perform replication checks */
- if (ReplicationChecks(msg) > 0) return;
+ lprintf(9, "Performing replication checks\n");
+ if (ReplicationChecks(msg) > 0) return(-1);
/* Network mail - send a copy to the network program. */
- if ((strlen(recipient) > 0) && (mailtype != MES_LOCAL)) {
+ if ((strlen(recipient) > 0) && (mailtype == MES_BINARY)) {
+ lprintf(9, "Sending network spool\n");
sprintf(aaa, "./network/spoolin/netmail.%04lx.%04x.%04x",
(long) getpid(), CC->cs_pid, ++seqnum);
lprintf(9, "Saving a copy to %s\n", aaa);
}
/* Save it to disk */
+ lprintf(9, "Saving to disk\n");
newmsgid = send_message(msg, generate_id, network_fp);
if (network_fp != NULL) {
fclose(network_fp);
system("exec nohup ./netproc -i >/dev/null 2>&1 &");
}
- if (newmsgid <= 0L) return;
+ if (newmsgid <= 0L) return(-1);
/* Write a supplemental message info record. This doesn't have to
* be a critical section because nobody else knows about this message
* yet.
*/
+ lprintf(9, "Creating SuppMsgInfo record\n");
memset(&smi, 0, sizeof(struct SuppMsgInfo));
smi.smi_msgnum = newmsgid;
smi.smi_refcount = 0;
PutSuppMsgInfo(&smi);
/* Now figure out where to store the pointers */
+ lprintf(9, "Storing pointers\n");
/* If this is being done by the networker delivering a private
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
+ /* For internet mail, drop a copy in the outbound queue room */
+ if (mailtype == MES_INTERNET) {
+ CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
+
+ /* And generate delivery instructions */
+ lprintf(9, "Generating delivery instructions\n");
+ instr = mallok(2048);
+ sprintf(instr,
+ "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+ "remote|%s|0||\n",
+ SPOOLMIME, newmsgid, time(NULL), recipient );
+
+ imsg = mallok(sizeof(struct CtdlMessage));
+ memset(imsg, 0, sizeof(struct CtdlMessage));
+ imsg->cm_magic = CTDLMESSAGE_MAGIC;
+ imsg->cm_anon_type = MES_NORMAL;
+ imsg->cm_format_type = FMT_RFC822;
+ imsg->cm_fields['M'] = instr;
+ CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL, 1);
+ CtdlFreeMessage(imsg);
+ }
+
/* Bump this user's messages posted counter. */
+ lprintf(9, "Updating user\n");
lgetuser(&CC->usersupp, CC->curr_user);
CC->usersupp.posted = CC->usersupp.posted + 1;
lputuser(&CC->usersupp);
*/
if ((strlen(recipient) > 0) && (mailtype == MES_LOCAL)) {
if (getuser(&userbuf, recipient) == 0) {
+ lprintf(9, "Delivering private mail\n");
MailboxName(actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
}
/* Perform "after save" hooks */
+ lprintf(9, "Performing after-save hooks\n");
PerformMessageHooks(msg, EVT_AFTERSAVE);
/* */
+ lprintf(9, "Returning to original room\n");
if (strcasecmp(hold_rm, CC->quickroom.QRname))
getroom(&CC->quickroom, hold_rm);
+
+ return(newmsgid);
}
}
+
+/*
+ * Back end function used by make_message() and similar functions
+ */
+char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */
+ size_t maxlen, /* maximum message length */
+ char *exist /* if non-null, append to it;
+ exist is ALWAYS freed */
+ ) {
+ char buf[256];
+ size_t message_len = 0;
+ size_t buffer_len = 0;
+ char *ptr, *append;
+ char *m;
+
+ if (exist == NULL) {
+ m = mallok(4096);
+ }
+ else {
+ m = reallok(exist, strlen(exist) + 4096);
+ if (m == NULL) phree(exist);
+ }
+ if (m == NULL) {
+ while ( (client_gets(buf)>0) && strcmp(buf, terminator) ) ;;
+ return(NULL);
+ } else {
+ buffer_len = 4096;
+ m[0] = 0;
+ message_len = 0;
+ }
+ /* read in the lines of message text one by one */
+ append = NULL;
+ while ( (client_gets(buf)>0) && strcmp(buf, terminator) ) {
+
+ /* augment the buffer if we have to */
+ if ((message_len + strlen(buf) + 2) > buffer_len) {
+ lprintf(9, "realloking\n");
+ ptr = reallok(m, (buffer_len * 2) );
+ if (ptr == NULL) { /* flush if can't allocate */
+ while ( (client_gets(buf)>0) &&
+ strcmp(buf, terminator)) ;;
+ return(m);
+ } else {
+ buffer_len = (buffer_len * 2);
+ m = ptr;
+ append = NULL;
+ lprintf(9, "buffer_len is %d\n", buffer_len);
+ }
+ }
+
+ if (append == NULL) append = m;
+ while (strlen(append) > 0) ++append;
+ strcpy(append, buf);
+ strcat(append, "\n");
+ message_len = message_len + strlen(buf) + 1;
+
+ /* if we've hit the max msg length, flush the rest */
+ if (message_len >= maxlen) {
+ while ( (client_gets(buf)>0) && strcmp(buf, terminator)) ;;
+ return(m);
+ }
+ }
+ return(m);
+}
+
+
+
+
/*
* Build a binary message to be saved on disk.
*/
int a;
char dest_node[32];
char buf[256];
- size_t message_len = 0;
- size_t buffer_len = 0;
- char *ptr;
struct CtdlMessage *msg;
msg = mallok(sizeof(struct CtdlMessage));
if (dest_node[0] != 0)
msg->cm_fields['D'] = strdoop(dest_node);
- msg->cm_fields['M'] = mallok(4096);
- if (msg->cm_fields['M'] == NULL) {
- while (client_gets(buf), strcmp(buf, "000")) ;; /* flush */
- return(msg);
- } else {
- buffer_len = 4096;
- msg->cm_fields['M'][0] = 0;
- message_len = 0;
- }
-
- /* read in the lines of message text one by one */
- while (client_gets(buf), strcmp(buf, "000")) {
-
- /* augment the buffer if we have to */
- if ((message_len + strlen(buf) + 2) > buffer_len) {
- ptr = reallok(msg->cm_fields['M'], (buffer_len * 2) );
- if (ptr == NULL) { /* flush if can't allocate */
- while (client_gets(buf), strcmp(buf, "000")) ;;
- return(msg);
- } else {
- buffer_len = (buffer_len * 2);
- msg->cm_fields['M'] = ptr;
- }
- }
- strcat(msg->cm_fields['M'], buf);
- strcat(msg->cm_fields['M'], "\n");
+ msg->cm_fields['M'] = CtdlReadMessageBody("000",
+ config.c_maxmsglen, NULL);
- /* if we've hit the max msg length, flush the rest */
- if (message_len >= config.c_maxmsglen) {
- while (client_gets(buf), strcmp(buf, "000")) ;;
- return(msg);
- }
- }
return(msg);
}
char recp[256];
int a;
int e = 0;
+ int valid_msg = 1;
unsigned char ch, which_field;
struct usersupp tempUS;
long msglen;
while (msglen > 0) {
client_read(&which_field, 1);
+ if (!isalpha(which_field)) valid_msg = 0;
--msglen;
tempbuf[0] = 0;
do {
tempbuf[a+1] = 0;
tempbuf[a] = ch;
} while ( (ch != 0) && (msglen > 0) );
- msg->cm_fields[which_field] = strdoop(tempbuf);
+ if (valid_msg)
+ msg->cm_fields[which_field] = strdoop(tempbuf);
}
msg->cm_flags = CM_SKIP_HOOKS;
- CtdlSaveMsg(msg, recp, "", e, 0);
+ if (valid_msg) CtdlSaveMsg(msg, recp, "", e, 0);
CtdlFreeMessage(msg);
phree(tempbuf);
}
void cmd_move(char *args)
{
long num;
- char targ[32];
+ char targ[256];
struct quickroom qtemp;
int err;
int is_copy = 0;
num = extract_long(args, 0);
extract(targ, args, 1);
+ targ[ROOMNAMELEN - 1] = 0;
is_copy = extract_int(args, 2);
getuser(&CC->usersupp, CC->curr_user);
/* Create the requested room if we have to. */
if (getroom(&qrbuf, roomname) != 0) {
- create_room(roomname, 4, "", 0);
+ create_room(roomname,
+ ( (is_mailbox != NULL) ? 4 : 3 ),
+ "", 0);
}
/* If the caller specified this object as unique, delete all
* other objects of this type that are currently in the room.
CtdlSaveMsg(msg, "", roomname, MES_LOCAL, 1);
CtdlFreeMessage(msg);
}
+
+
+
+
+
+
+void CtdlGetSysConfigBackend(long msgnum) {
+ config_msgnum = msgnum;
+}
+
+
+char *CtdlGetSysConfig(char *sysconfname) {
+ char hold_rm[ROOMNAMELEN];
+ long msgnum;
+ char *conf;
+ struct CtdlMessage *msg;
+ char buf[256];
+
+ strcpy(hold_rm, CC->quickroom.QRname);
+ if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) {
+ getroom(&CC->quickroom, hold_rm);
+ return NULL;
+ }
+
+
+ /* We want the last (and probably only) config in this room */
+ begin_critical_section(S_CONFIG);
+ config_msgnum = (-1L);
+ CtdlForEachMessage(MSGS_LAST, 1, sysconfname, NULL,
+ CtdlGetSysConfigBackend);
+ msgnum = config_msgnum;
+ end_critical_section(S_CONFIG);
+
+ if (msgnum < 0L) {
+ conf = NULL;
+ }
+ else {
+ msg = CtdlFetchMessage(msgnum);
+ if (msg != NULL) {
+ conf = strdoop(msg->cm_fields['M']);
+ CtdlFreeMessage(msg);
+ }
+ else {
+ conf = NULL;
+ }
+ }
+
+ getroom(&CC->quickroom, hold_rm);
+
+ lprintf(9, "eggstracting...\n");
+ if (conf != NULL) do {
+ extract_token(buf, conf, 0, '\n');
+ lprintf(9, "eggstracted <%s>\n", buf);
+ strcpy(conf, &conf[strlen(buf)+1]);
+ } while ( (strlen(conf)>0) && (strlen(buf)>0) );
+
+ return(conf);
+}
+
+void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) {
+ char temp[PATH_MAX];
+ FILE *fp;
+
+ strcpy(temp, tmpnam(NULL));
+
+ fp = fopen(temp, "w");
+ if (fp == NULL) return;
+ fprintf(fp, "%s", sysconfdata);
+ fclose(fp);
+
+ /* this handy API function does all the work for us */
+ CtdlWriteObject(SYSCONFIGROOM, sysconfname, temp, NULL, 0, 1, 0);
+ unlink(temp);
+}
+
+