}
-
/*
* Retrieve the "seen" message list for the current room.
*/
/* Learn about the user and room in question */
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
- if (which_set == ctdlsetseen_seen)
+ if (which_set == ctdlsetseen_seen) {
safestrncpy(buf, vbuf.v_seen, SIZ);
- if (which_set == ctdlsetseen_answered)
+ }
+ if (which_set == ctdlsetseen_answered) {
safestrncpy(buf, vbuf.v_answered, SIZ);
+ }
}
-
/*
* Manipulate the "seen msgs" string (or other message set strings)
*/
int is_seen = 0;
int was_seen = 0;
long lo = (-1L);
- long hi = (-1L); /// TODO: we just write here. y?
+ long hi = (-1L);
visit vbuf;
long *msglist;
int num_msgs = 0;
FreeStrBuf(&lostr);
FreeStrBuf(&histr);
-
/* Now translate the array of booleans back into a sequence set */
FlushStrBuf(vset);
was_seen = 0;
)
) {
if ((mode == MSGS_NEW) && (CC->user.flags & US_LASTOLD) && (lastold > 0L) && (printed_lastold == 0) && (!is_seen)) {
- if (CallBack)
+ if (CallBack) {
CallBack(lastold, userdata);
+ }
printed_lastold = 1;
++num_processed;
}
- if (CallBack) CallBack(thismsg, userdata);
+ if (CallBack) {
+ CallBack(thismsg, userdata);
+ }
++num_processed;
}
}
}
-
/*
* memfmout() - Citadel text formatter and paginator.
* Although the original purpose of this routine was to format
while (ch=*(mptr++), ch != 0) {
if (ch == '\n') {
- if (client_write(outbuf, len) == -1)
- {
+ if (client_write(outbuf, len) == -1) {
syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
- if (client_write(nl, nllen) == -1)
- {
+ if (client_write(nl, nllen) == -1) {
syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
}
else if (isspace(ch)) {
if (column > 72) { /* Beyond 72 columns, break on the next space */
- if (client_write(outbuf, len) == -1)
- {
+ if (client_write(outbuf, len) == -1) {
syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
- if (client_write(nl, nllen) == -1)
- {
+ if (client_write(nl, nllen) == -1) {
syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
outbuf[len++] = ch;
++column;
if (column > 1000) { /* Beyond 1000 columns, break anywhere */
- if (client_write(outbuf, len) == -1)
- {
+ if (client_write(outbuf, len) == -1) {
syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
- if (client_write(nl, nllen) == -1)
- {
+ if (client_write(nl, nllen) == -1) {
syslog(LOG_ERR, "msgbase: memfmout(): aborting due to write failure");
return;
}
}
}
if (len) {
- if (client_write(outbuf, len) == -1)
- {
+ if (client_write(outbuf, len) == -1) {
syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
}
-
/*
* Callback function for mime parser that simply lists the part
*/
}
}
+
/*
* Callback function for multipart prefix
*/
}
}
+
/*
* Callback function for multipart sufffix
*/
}
-
/*
* Callback function for mime parser that outputs a section all at once.
* We can specify the desired section by part number *or* content-id.
}
}
+
struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const char *Buffer, long Length)
{
struct CtdlMessage *ret = NULL;
long len;
/* work around possibly buggy messages: */
- while (field_header == '\0')
- {
+ while (field_header == '\0') {
if (mptr >= upper_bound) {
break;
}
return NULL;
}
- if (dmsgtext->ptr[dmsgtext->len - 1] != '\0')
- {
+ if (dmsgtext->ptr[dmsgtext->len - 1] != '\0') {
syslog(LOG_ERR, "msgbase: CtdlFetchMessage(%ld, %d) Forcefully terminating message!!", msgnum, with_body);
dmsgtext->ptr[dmsgtext->len - 1] = '\0';
}
}
-
/*
* Pre callback function for multipart/alternative
*
}
}
+
/*
* Post callback function for multipart/alternative
*/
}
}
+
/*
* Inline callback function for mime parser that wants to display text
*/
}
}
+
/*
* The client is elegant and sophisticated and wants to be choosy about
* MIME content types, so figure out which multipart/alternative part
ma = (struct ma_info *)cbuserdata;
- // NOTE: REMOVING THIS CONDITIONAL FIXES BUG 220
- // http://bugzilla.citadel.org/show_bug.cgi?id=220
- // I don't know if there are any side effects! Please TEST TEST TEST
- //if (ma->is_ma > 0) {
-
for (i=0; i<num_tokens(CC->preferred_formats, '|'); ++i) {
extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) {
}
}
+
/*
* Now that we've chosen our preferred part, output it.
*/
}
-
/*
* Get a message off disk. (returns om_* values found in msgbase.h)
*
}
-
void OutputCtdlMsgHeaders(
struct CtdlMessage *TheMessage,
int do_proto) /* do Citadel protocol responses? */
* local Citadel network.
*/
suppress_f = 0;
- if (!CM_IsEmpty(TheMessage, eNodeName) &&
- (haschar(TheMessage->cm_fields[eNodeName], '.') == 0))
- {
+ if (!CM_IsEmpty(TheMessage, eNodeName) && (haschar(TheMessage->cm_fields[eNodeName], '.') == 0)) {
suppress_f = 1;
}
}
/* Masquerade display name if needed */
else {
- if (do_proto) cprintf("%s=%s\n",
- msgkeys[Field],
- TheMessage->cm_fields[Field]
- );
+ if (do_proto) {
+ cprintf("%s=%s\n", msgkeys[Field], TheMessage->cm_fields[Field]);
+ }
}
}
}
}
-
}
+
void OutputRFC822MsgHeaders(
struct CtdlMessage *TheMessage,
int flags, /* should the bessage be exported clean */
subject_found = 1;
break;
case emessageId:
- safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found.
+ safestrncpy(mid, mptr, sizeof_mid);
break;
case erFc822Addr:
safestrncpy(fuser, mptr, sizeof_fuser);
- /* case eOriginalRoom:
- cprintf("X-Citadel-Room: %s%s",
- mptr, nl)
- break;
- ; */
case eNodeName:
safestrncpy(snode, mptr, sizeof_snode);
break;
case eRecipient:
- if (haschar(mptr, '@') == 0)
- {
+ if (haschar(mptr, '@') == 0) {
sanitize_truncated_recipient(mptr);
cprintf("To: %s@%s", mptr, CtdlGetConfigStr("c_fqdn"));
cprintf("%s", nl);
}
- else
- {
+ else {
if ((flags & QP_EADDR) != 0) {
mptr = qp_encode_email_addrs(mptr);
}
}
break;
case eTimestamp:
- datestring(datestamp, sizeof datestamp,
- atol(mptr), DATESTRING_RFC822);
+ datestring(datestamp, sizeof datestamp, atol(mptr), DATESTRING_RFC822);
cprintf("Date: %s%s", datestamp, nl);
break;
case eWeferences:
case eVltMsgNum:
/* these don't map to mime message headers. */
break;
-
}
- if (mptr != mpptr)
+ if (mptr != mpptr) {
free (mptr);
+ }
}
}
if (subject_found == 0) {
struct CtdlMessage *TheMessage,
int headers_only, /* eschew the message body? */
int flags, /* should the bessage be exported clean? */
-
const char *nl, int nlen)
{
cit_uint8_t prev_ch;
mptr = TheMessage->cm_fields[eMesageText];
-
prev_ch = '\0';
while (*mptr != '\0') {
if (*mptr == '\r') {
((headers_only == HEADERS_ONLY) && (mptr < StartOfText)) ||
((headers_only != HEADERS_NONE) &&
(headers_only != HEADERS_ONLY))
- ) {
+ ) {
if (*mptr == '\n') {
memcpy(&outbuf[outlen], nl, nllen);
outlen += nllen;
}
}
}
- if (flags & ESC_DOT)
- {
- if ((prev_ch == '\n') &&
- (*mptr == '.') &&
- ((*(mptr+1) == '\r') || (*(mptr+1) == '\n')))
- {
+ if (flags & ESC_DOT) {
+ if ((prev_ch == '\n') && (*mptr == '.') && ((*(mptr+1) == '\r') || (*(mptr+1) == '\n'))) {
outbuf[outlen++] = '.';
}
prev_ch = *mptr;
}
++mptr;
if (outlen > 1000) {
- if (client_write(outbuf, outlen) == -1)
- {
+ if (client_write(outbuf, outlen) == -1) {
syslog(LOG_ERR, "msgbase: Dump_RFC822HeadersBody() aborting due to write failure");
return;
}
}
-
/* 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.
ch = '\r';
}
}
- /* if we reach the outer bounds of our buffer,
- abort without respect what whe purge. */
- if (xlline &&
- ((isspace(ch)) ||
- (buflen > SIZ - nllen - 2)))
+
+ /* if we reach the outer bounds of our buffer, abort without respect for what we purge. */
+ if (xlline && ((isspace(ch)) || (buflen > SIZ - nllen - 2))) {
ch = '\r';
+ }
if (ch == '\r') {
memcpy (&buf[buflen], nl, nllen);
buflen += nllen;
buf[buflen] = '\0';
- if (client_write(buf, buflen) == -1)
- {
+ if (client_write(buf, buflen) == -1) {
syslog(LOG_ERR, "msgbase: DumpFormatFixed() aborting due to write failure");
return;
}
}
}
buf[buflen] = '\0';
- if (!IsEmptyStr(buf))
+ if (!IsEmptyStr(buf)) {
cprintf("%s%s", buf, nl);
+ }
}
+
/*
* Get a message off disk. (returns om_* values found in msgbase.h)
*/
*/
void GetMetaData(struct MetaData *smibuf, long msgnum)
{
-
struct cdbdata *cdbsmi;
long TheIndex;
cdbsmi = cdb_fetch(CDB_MSGMAIN, &TheIndex, sizeof(long));
if (cdbsmi == NULL) {
- return; /* record not found; go with defaults */
+ return; /* record not found; leave it alone */
}
- memcpy(smibuf, cdbsmi->ptr, // FIXME can we do this without a memcpy?
+ memcpy(smibuf, cdbsmi->ptr,
((cdbsmi->len > sizeof(struct MetaData)) ?
- sizeof(struct MetaData) : cdbsmi->len));
+ sizeof(struct MetaData) : cdbsmi->len)
+ );
cdb_free(cdbsmi);
return;
}
cdb_store(CDB_MSGMAIN,
&TheIndex, (int)sizeof(long),
- smibuf, (int)sizeof(struct MetaData));
-
+ smibuf, (int)sizeof(struct MetaData)
+ );
}
+
/*
* AdjRefCount - submit an adjustment to the reference count for a message.
* (These are just queued -- we actually process them later.)
return;
}
+
void AdjRefCountList(long *msgnum, long nmsg, int incr)
{
long i, the_size, offset;
}
-
/*
* TDAP_AdjRefCount - adjust the reference count for a message.
* This one does it "for real" because it's called by
*/
void TDAP_AdjRefCount(long msgnum, int incr)
{
-
struct MetaData smi;
long delnum;
smi.meta_refcount += incr;
PutMetaData(&smi);
end_critical_section(S_SUPPMSGMAIN);
- syslog(LOG_DEBUG, "msgbase: TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d",
- msgnum, incr, smi.meta_refcount
- );
+ syslog(LOG_DEBUG, "msgbase: TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d", msgnum, incr, smi.meta_refcount);
/* If the reference count is now zero, delete the message
* (and its supplementary record as well).
delnum = (0L - msgnum);
cdb_delete(CDB_MSGMAIN, &delnum, (int)sizeof(long));
}
-
}
+
/*
* Write a generic object to this room
*
*/
void CtdlWriteObject(char *req_room, /* Room to stuff it in */
char *content_type, /* MIME type of this object */
- char *raw_message, /* Data to be written */
- off_t raw_length, /* Size of raw_message */
+ char *raw_message, /* Data to be written */
+ off_t raw_length, /* Size of raw_message */
struct ctdluser *is_mailbox, /* Mailbox room? */
int is_binary, /* Is encoding necessary? */
int is_unique, /* Del others of this type? */
- unsigned int flags /* Internal save flags */
+ unsigned int flags /* Internal save flags */
)
{
struct ctdlroom qrbuf;
/* Create the requested room if we have to. */
if (CtdlGetRoom(&qrbuf, roomname) != 0) {
- CtdlCreateRoom(roomname,
- ( (is_mailbox != NULL) ? 5 : 3 ),
- "", 0, 1, 0, VIEW_BBS);
+ CtdlCreateRoom(roomname, ( (is_mailbox != NULL) ? 5 : 3 ), "", 0, 1, 0, VIEW_BBS);
}
/* If the caller specified this object as unique, delete all
* other objects of this type that are currently in the room.
}
-
-/*****************************************************************************/
-/* MODULE INITIALIZATION STUFF */
-/*****************************************************************************/
+/************************************************************************/
+/* MODULE INITIALIZATION */
+/************************************************************************/
CTDL_MODULE_INIT(msgbase)
{
FillMsgKeyLookupTable();
}
- /* return our Subversion id for the Log */
+ /* return our module id for the log */
return "msgbase";
}
projects / citadel.git / commitdiff