if (content_type != NULL)
if (strlen(content_type) > 0)
for (a = 0; a < num_msgs; ++a) {
+ lprintf(9, "Trying %ld\n", msglist[a]);
GetSuppMsgInfo(&smi, msglist[a]);
+ lprintf(9, "ct is %s\n", smi.smi_content_type);
if (strcasecmp(smi.smi_content_type, content_type)) {
msglist[a] = 0L;
}
int headers_only, /* eschew the message body? */
int do_proto, /* do Citadel protocol responses? */
FILE *outfp,
- int outsock
+ int outsock,
+ int crlf /* Use CRLF newlines instead of LF? */
) {
int a, i, k;
char buf[1024];
char display_name[256];
struct CtdlMessage *TheMessage;
char *mptr;
+ char *nl; /* newline string */
/* buffers needed for RFC822 translation */
char suser[256];
if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
ch = 32;
if (((old == 13) || (old == 10)) && (isspace(real))) {
- omprintf("\n");
+ omprintf("%s", nl);
c = 1;
}
if (ch > 126)
if (ch > 32) {
if (((strlen(aaa) + c) > (75)) && (strlen(aaa) > (75))) {
- omprintf("\n%s", aaa);
+ omprintf("%s%s", nl, aaa);
c = strlen(aaa);
aaa[0] = 0;
}
}
if (ch == 32) {
if ((strlen(aaa) + c) > (75)) {
- omprintf("\n");
+ omprintf("%s", nl);
c = 1;
}
omprintf("%s ", aaa);
goto FMTA;
}
if ((ch == 13) || (ch == 10)) {
- omprintf("%s\n", aaa);
+ omprintf("%s%s", aaa, nl);
c = 1;
strcpy(aaa, "");
goto FMTA;
}
goto FMTA;
-FMTEND: omprintf("%s\n", aaa);
+FMTEND: omprintf("%s%s", aaa, nl);
}
/* END NESTED FUNCTION omfmout() */
if (!strcasecmp(cbtype, "text/plain")) {
wlen = length;
wptr = content;
- while (wlen--) omprintf("%c", *wptr++);
+ 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--) omprintf("%c", *wptr++);
+ 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)\n",
- partnum, filename, cbtype, length);
+ omprintf("Part %s: %s (%s) (%d bytes)%s",
+ partnum, filename, cbtype, length, nl);
}
}
TheMessage = NULL;
sprintf(mid, "%ld", msg_num);
+ nl = (crlf ? "\r\n" : "\n");
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
if (do_proto) cprintf("%d Not logged in.\n",
if (i == 'A') {
strcpy(luser, mptr);
} else if (i == 'P') {
- omprintf("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')
- omprintf("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')
- omprintf("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')
- omprintf("To: %s\n", mptr);
+ omprintf("To: %s%s", mptr, nl);
else if (i == 'T') {
xtime = atol(mptr);
omprintf("Date: %s", asctime(localtime(&xtime)));
if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
- omprintf("Message-ID: <%s@%s>\n", mid, snode);
+ omprintf("Message-ID: <%s@%s>%s", mid, snode, nl);
PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
- omprintf("From: %s@%s (%s)\n", suser, snode, luser);
- omprintf("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 */
if (do_proto) cprintf("text\n");
/* if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822)) { */
if (mode == MT_RFC822) {
- omprintf("\n");
+ omprintf("%s", nl);
}
/* If the format type on disk is 1 (fixed-format), then we want
if (ch == 13)
ch = 10;
if ((ch == 10) || (strlen(buf) > 250)) {
- omprintf("%s\n", buf);
+ omprintf("%s%s", buf, nl);
strcpy(buf, "");
} else {
buf[strlen(buf) + 1] = 0;
}
}
if (strlen(buf) > 0)
- omprintf("%s\n", buf);
+ omprintf("%s%s", buf, nl);
}
/* If the message on disk is format 0 (Citadel vari-format), we
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, NULL, -1);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, NULL, -1, 0);
return;
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, NULL, -1);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, NULL, -1, 1);
}
long msgid;
msgid = extract_long(cmdbuf, 0);
- CtdlOutputMsg(msgid, MT_MIME, 0, 1, NULL, -1);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, NULL, -1, 0);
}
/*
msgid = extract_long(cmdbuf, 0);
extract(desired_section, cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, NULL, -1);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, NULL, -1, 1);
}
getroom(&CC->quickroom, hold_rm);
/* Bump the reference count for this message. */
- AdjRefCount(msgid, +1);
+ if ((flags & SM_DONT_BUMP_REF)==0) {
+ AdjRefCount(msgid, +1);
+ }
/* Return success. */
if (msg != NULL) CtdlFreeMessage(msg);
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(-1); /* self check */
/* Now figure out where to store the pointers */
lprintf(9, "Storing pointers\n");
-
/* If this is being done by the networker delivering a private
* message, we want to BYPASS saving the sender's copy (because there
* is no local sender; it would otherwise go to the Trashcan).
}
/* 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);
}
if (strcasecmp(hold_rm, CC->quickroom.QRname))
getroom(&CC->quickroom, hold_rm);
+ /* For internet mail, generate delivery instructions
+ * (Yes, this is recursive! Deal with it!)
+ */
+ if (mailtype == MES_INTERNET) {
+ 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['A'] = strdoop("Citadel");
+ imsg->cm_fields['M'] = instr;
+ CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL, 1);
+ CtdlFreeMessage(imsg);
+ }
+
return(newmsgid);
}
*/
begin_critical_section(S_SUPPMSGMAIN);
GetSuppMsgInfo(&smi, msgnum);
+ lprintf(9, "Ref count for message <%ld> before write is <%d>\n",
+ msgnum, smi.smi_refcount);
smi.smi_refcount += incr;
PutSuppMsgInfo(&smi);
end_critical_section(S_SUPPMSGMAIN);
-
lprintf(9, "Ref count for message <%ld> after write is <%d>\n",
msgnum, smi.smi_refcount);