// Implements the message store.
//
-// Copyright (c) 1987-2021 by the citadel.org team
+// Copyright (c) 1987-2022 by the citadel.org team
//
// This program is open source software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 3.
#include <stdio.h>
#include <regex.h>
#include <sys/stat.h>
+#include <assert.h>
#include <libcitadel.h>
#include "ctdl_module.h"
#include "citserver.h"
}
-struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const char *Buffer, long Length)
-{
+struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const char *Buffer, long Length) {
struct CtdlMessage *ret = NULL;
const char *mptr;
const char *upper_bound;
return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
- /* MT_SPEW_SECTION is like MT_DOWNLOAD except it outputs the whole MIME part
- * in a single server operation instead of opening a download file.
- */
+ // MT_SPEW_SECTION is like MT_DOWNLOAD except it outputs the whole MIME part
+ // in a single server operation instead of opening a download file.
if (mode == MT_SPEW_SECTION) {
if (TheMessage->cm_format_type != FMT_RFC822) {
if (do_proto)
cprintf("%d This is not a MIME message.\n",
ERROR + ILLEGAL_VALUE);
- } else {
- /* Parse the message text component */
+ }
+ else {
+ // Locate and parse the component specified by the caller
int found_it = 0;
+ mime_parser(CM_RANGE(TheMessage, eMesageText), *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
- mime_parser(CM_RANGE(TheMessage, eMesageText),
- *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
- /* If section wasn't found, print an error
- */
+ // If section wasn't found, print an error
if (!found_it) {
- if (do_proto) cprintf(
- "%d Section %s not found.\n",
- ERROR + FILE_NOT_FOUND,
- CC->download_desired_section);
+ if (do_proto) {
+ cprintf( "%d Section %s not found.\n", ERROR + FILE_NOT_FOUND, CC->download_desired_section);
+ }
}
}
return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
- /* now for the user-mode message reading loops */
+ // now for the user-mode message reading loops
if (do_proto) cprintf("%d msg:\n", LISTING_FOLLOWS);
- /* Does the caller want to skip the headers? */
+ // Does the caller want to skip the headers?
if (headers_only == HEADERS_NONE) goto START_TEXT;
- /* Tell the client which format type we're using. */
+ // Tell the client which format type we're using.
if ( (mode == MT_CITADEL) && (do_proto) ) {
cprintf("type=%d\n", TheMessage->cm_format_type); // Tell the client which format type we're using.
}
- /* nhdr=yes means that we're only displaying headers, no body */
+ // nhdr=yes means that we're only displaying headers, no body
if ( (TheMessage->cm_anon_type == MES_ANONONLY)
&& ((mode == MT_CITADEL) || (mode == MT_MIME))
&& (do_proto)
OutputCtdlMsgHeaders(TheMessage, do_proto);
}
- /* begin header processing loop for RFC822 transfer format */
+ // begin header processing loop for RFC822 transfer format
strcpy(suser, "");
strcpy(luser, "");
strcpy(fuser, "");
}
}
- /* end header processing loop ... at this point, we're in the text */
+ // end header processing loop ... at this point, we're in the text
START_TEXT:
if (headers_only == HEADERS_FAST) goto DONE;
- /* Tell the client about the MIME parts in this message */
+ // Tell the client about the MIME parts in this message
if (TheMessage->cm_format_type == FMT_RFC822) {
if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
memset(&ma, 0, sizeof(struct ma_info));
(do_proto ? *list_this_suff : NULL),
(void *)&ma, 1);
}
- else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
+ else if (mode == MT_RFC822) { // unparsed RFC822 dump
Dump_RFC822HeadersBody(
TheMessage,
headers_only,
goto DONE;
}
- /* signify start of msg text */
+ // signify start of msg text
if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
if (do_proto) cprintf("text\n");
}
if (TheMessage->cm_format_type == FMT_FIXED)
DumpFormatFixed(
TheMessage,
- mode, /* how would you like that message? */
+ mode, // how would you like that message?
nl, nlen);
- /* If the message on disk is format 0 (Citadel vari-format), we
- * output using the formatter at 80 columns. This is the final output
- * form if the transfer format is RFC822, but if the transfer format
- * is Citadel proprietary, it'll still work, because the indentation
- * for new paragraphs is correct and the client will reformat the
- * message to the reader's screen width.
- */
+ // If the message on disk is format 0 (Citadel vari-format), we
+ // output using the formatter at 80 columns. This is the final output
+ // form if the transfer format is RFC822, but if the transfer format
+ // is Citadel proprietary, it'll still work, because the indentation
+ // for new paragraphs is correct and the client will reformat the
+ // message to the reader's screen width.
+ //
if (TheMessage->cm_format_type == FMT_CITADEL) {
if (mode == MT_MIME) {
cprintf("Content-type: text/x-citadel-variformat\n\n");
memfmout(TheMessage->cm_fields[eMesageText], nl);
}
- /* If the message on disk is format 4 (MIME), we've gotta hand it
- * off to the MIME parser. The client has already been told that
- * this message is format 1 (fixed format), so the callback function
- * we use will display those parts as-is.
- */
+ // If the message on disk is format 4 (MIME), we've gotta hand it
+ // off to the MIME parser. The client has already been told that
+ // this message is format 1 (fixed format), so the callback function
+ // we use will display those parts as-is.
+ //
if (TheMessage->cm_format_type == FMT_RFC822) {
memset(&ma, 0, sizeof(struct ma_info));
return(om_ok);
}
-/*
- * Save one or more message pointers into a specified room
- * (Returns 0 for success, nonzero for failure)
- * roomname may be NULL to use the current room
- *
- * Note that the 'supplied_msg' field may be set to NULL, in which case
- * the message will be fetched from disk, by number, if we need to perform
- * replication checks. This adds an additional database read, so if the
- * caller already has the message in memory then it should be supplied. (Obviously
- * this mode of operation only works if we're saving a single message.)
- */
+// Save one or more message pointers into a specified room
+// (Returns 0 for success, nonzero for failure)
+// roomname may be NULL to use the current room
+//
+// Note that the 'supplied_msg' field may be set to NULL, in which case
+// the message will be fetched from disk, by number, if we need to perform
+// replication checks. This adds an additional database read, so if the
+// caller already has the message in memory then it should be supplied. (Obviously
+// this mode of operation only works if we're saving a single message.)
+//
int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs,
int do_repl_check, struct CtdlMessage *supplied_msg, int suppress_refcount_adj
) {
if (recps == NULL) {
qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
}
- else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) {
+ else if (recps->num_local + recps->num_internet > 0) {
qualified_for_journaling = CtdlGetConfigInt("c_journal_email");
}
else {
/*
* Back end function used by CtdlMakeMessage() and similar functions
*/
-StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */
+StrBuf *CtdlReadMessageBodyBuf(char *terminator, // token signalling EOT
long tlen,
- size_t maxlen, /* maximum message length */
- StrBuf *exist, /* if non-null, append to it;
- exist is ALWAYS freed */
- int crlf /* CRLF newlines instead of LF */
+ size_t maxlen, // maximum message length
+ StrBuf *exist, // if non-null, append to it; exist is ALWAYS freed
+ int crlf // CRLF newlines instead of LF
) {
StrBuf *Message;
StrBuf *LineBuf;
}
/* if we've hit the max msg length, flush the rest */
- if (StrLength(Message) >= maxlen) flushing = 1;
+ if (StrLength(Message) >= maxlen) {
+ flushing = 1;
+ }
} while (!finished);
FreeStrBuf(&LineBuf);
+
+ if (flushing) {
+ syslog(LOG_ERR, "msgbase: exceeded maximum message length of %ld - message was truncated", maxlen);
+ }
+
return Message;
}
-/*
- * Back end function used by CtdlMakeMessage() and similar functions
- */
-char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */
+// Back end function used by CtdlMakeMessage() and similar functions
+char *CtdlReadMessageBody(char *terminator, // token signalling EOT
long tlen,
- size_t maxlen, /* maximum message length */
- StrBuf *exist, /* if non-null, append to it;
- exist is ALWAYS freed */
- int crlf /* CRLF newlines instead of LF */
- )
-{
+ size_t maxlen, // maximum message length
+ StrBuf *exist, // if non-null, append to it; exist is ALWAYS freed
+ int crlf // CRLF newlines instead of LF
+) {
StrBuf *Message;
Message = CtdlReadMessageBodyBuf(terminator,
exist,
crlf
);
- if (Message == NULL)
+ if (Message == NULL) {
return NULL;
- else
+ }
+ else {
return SmashStrBuf(&Message);
+ }
}
projects / citadel.git / blobdiff