/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
- if (TheMessage->cm_format_type != 4) {
+ if (TheMessage->cm_format_type != FMT_RFC822) {
cprintf("%d This is not a MIME message.\n",
ERROR);
} else if (CC->download_fp != NULL) {
* MIME message, *lie* about it and tell the user it's fixed-format.
*/
if (mode == MT_CITADEL) {
- if (TheMessage->cm_format_type == 4)
+ if (TheMessage->cm_format_type == FMT_RFC822)
cprintf("type=1\n");
else
cprintf("type=%d\n", TheMessage->cm_format_type);
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);
}
/* signify start of msg text */
if (mode == MT_CITADEL)
cprintf("text\n");
- if ((mode == MT_RFC822) && (TheMessage->cm_format_type != 4))
+ if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822))
cprintf("\n");
/* 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)
* for new paragraphs is correct and the client will reformat the
* message to the reader's screen width.
*/
- if (TheMessage->cm_format_type == 0) {
+ if (TheMessage->cm_format_type == FMT_CITADEL) {
memfmout(80, mptr, 0);
}
* 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);
/*
* 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 */
static int seqnum = 1;
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.
/* Perform "before save" hooks (aborting if any return nonzero) */
lprintf(9, "Performing before-save hooks\n");
- if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return;
+ if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-1);
/* If this message has an Extended ID, perform replication checks */
lprintf(9, "Performing replication checks\n");
- if (ReplicationChecks(msg) > 0) return;
+ 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);
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
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
+ /* For internet mail, drop a copy in the outbound queue room */
+ /* FIX ... nothing's going to get delivered until we add
+ some delivery instructions!!! */
+ if (mailtype == MES_INTERNET) {
+ CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
+ }
+
/* Bump this user's messages posted counter. */
lprintf(9, "Updating user\n");
lgetuser(&CC->usersupp, CC->curr_user);
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, size_t maxlen) {
+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;
- m = mallok(4096);
+ 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);
msg->cm_fields['D'] = strdoop(dest_node);
- msg->cm_fields['M'] = CtdlReadMessageBody("000", config.c_maxmsglen);
+ msg->cm_fields['M'] = CtdlReadMessageBody("000",
+ config.c_maxmsglen, NULL);
return(msg);