#include <string.h>
#include <syslog.h>
#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"
* 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
*/
/*
- * Get a message off disk. (return value is the message's timestamp)
+ * Get a message off disk. (returns om_* values found in msgbase.h)
*
*/
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? */
+ 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];
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];
/* */
+
+ /* 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"))
+ || (strlen(cbtype)==0) ) {
+ 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() */
+
+ lprintf(7, "CtdlOutputMsg() msgnum=%ld, mode=%d\n",
+ msg_num, mode);
+
+ 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') {
- 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 == FMT_RFC822) { /* legacy text dump */
+ if (TheMessage->cm_format_type == FMT_RFC822) {
if (mode == MT_CITADEL) {
mime_parser(mptr, NULL, *list_this_part);
}
CtdlFreeMessage(TheMessage);
return(om_ok);
}
+ else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
+ /* FIX ... we have to put some code in here to avoid
+ * printing duplicate header information when both
+ * Citadel and RFC822 headers exist. Preference should
+ * probably be given to the RFC822 headers.
+ */
+ while (ch=*(mptr++), ch!=0) {
+ if (ch==13) ;
+ else if (ch==10) omprintf("%s", nl);
+ else omprintf("%c", ch);
+ }
+ if (do_proto) cprintf("000\n");
+ CtdlFreeMessage(TheMessage);
+ return(om_ok);
+ }
}
if (headers_only) {
/* signify start of msg text */
if (mode == MT_CITADEL)
if (do_proto) cprintf("text\n");
- if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822))
- cprintf("\n");
+ 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
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
* message to the reader's screen width.
*/
if (TheMessage->cm_format_type == FMT_CITADEL) {
- memfmout(80, mptr, 0);
+ omfmout(mptr);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 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);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, NULL, -1, 1);
}
long msgid;
msgid = extract_long(cmdbuf, 0);
- CtdlOutputMsg(msgid, MT_MIME, 0, 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);
+ 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 */
}
lprintf(9, "Possibly relocating\n");
- if (strcasecmp(actual_rm, CC->quickroom.QRname))
+ if (strcasecmp(actual_rm, CC->quickroom.QRname)) {
getroom(&CC->quickroom, actual_rm);
+ }
+
+ /*
+ * If this message has no O (room) field, generate one.
+ */
+ if (msg->cm_fields['O'] == NULL) {
+ msg->cm_fields['O'] = strdoop(CC->quickroom.QRname);
+ }
/* Perform "before save" hooks (aborting if any return nonzero) */
lprintf(9, "Performing before-save hooks\n");
/* 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);
projects / citadel.git / blobdiff