#include "dynloader.h"
#include "tools.h"
#include "mime_parser.h"
-
-#define MSGS_ALL 0
-#define MSGS_OLD 1
-#define MSGS_NEW 2
-#define MSGS_FIRST 3
-#define MSGS_LAST 4
-#define MSGS_GT 5
+#include "html.h"
#define desired_section ((char *)CtdlGetUserData(SYM_DESIRED_SECTION))
+#define ma ((struct ma_info *)CtdlGetUserData(SYM_MA_INFO))
extern struct config config;
+/* FIX dumb stub function */
+void save_message(char *junk, char *more_junk, char *foo, int wahw, int ee) {
+}
/*
* This function is self explanatory.
msglist[a] = 0L;
}
}
+
+ num_msgs = sort_msglist(msglist, num_msgs);
+
/*
* Now iterate through the message list, according to the
* criteria supplied by the caller.
if (num_msgs > 0)
for (a = 0; a < num_msgs; ++a) {
thismsg = msglist[a];
- if ((thismsg >= 0)
+ if ((thismsg > 0)
&& (
(mode == MSGS_ALL)
strcpy(buffer, "");
c = 1; /* c is the current pos */
- FMTA:if (subst) {
+FMTA: if (subst) {
while (ch = *mptr, ((ch != 0) && (strlen(buffer) < 126))) {
ch = *mptr++;
buffer[strlen(buffer) + 1] = 0;
buffer[strlen(buffer) + 1] = 0;
a = buffer[0];
strcpy(buffer, &buffer[1]);
- } else
+ } else {
ch = *mptr++;
+ }
old = real;
real = ch;
}
goto FMTA;
- FMTEND:cprintf("%s\n", aaa);
+FMTEND: cprintf("%s\n", aaa);
}
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 {
+ }
+ 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);
}
/*
* Load a message from disk into memory.
- * (This will replace a big piece of output_message() eventually)
+ * This is used by output_message() and other fetch functions.
*
* NOTE: Caller is responsible for freeing the returned CtdlMessage struct
* using the CtdlMessageFree() function.
dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
if (dmsgtext == NULL) {
- lprintf(9, "CtdlMessage(%ld) failed.\n");
+ lprintf(9, "CtdlFetchMessage(%ld) failed.\n");
return NULL;
}
mptr = dmsgtext->ptr;
return (ret);
}
+
+/*
+ * Returns 1 if the supplied pointer points to a valid Citadel message.
+ * If the pointer is NULL or the magic number check fails, returns 0.
+ */
+int is_valid_message(struct CtdlMessage *msg) {
+ if (msg == NULL)
+ return 0;
+ if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) {
+ lprintf(3, "is_valid_message() -- self-check failed\n");
+ return 0;
+ }
+ return 1;
+}
+
+
/*
* 'Destructor' for struct CtdlMessage
*/
{
int i;
- if (msg == NULL)
- return;
- if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) {
- lprintf(3, "CtdlFreeMessage() -- self-check failed\n");
- return;
- }
+ if (is_valid_message(msg) == 0) return;
+
for (i = 0; i < 256; ++i)
if (msg->cm_fields[i] != NULL)
phree(msg->cm_fields[i]);
cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
return;
}
+
/* FIX ... small security issue
* We need to check to make sure the requested message is actually
* in the current room, and set msg_ok to 1 only if it is. This
*/
TheMessage = CtdlFetchMessage(msg_num);
if (TheMessage == NULL) {
- cprintf("%d Can't locate message %ld on disk\n", ERROR, msg_num);
+ cprintf("%d Can't locate msg %ld on disk\n", ERROR, msg_num);
return;
}
CtdlFreeMessage(TheMessage);
return;
}
+
/* now for the user-mode message reading loops */
cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
- if (mode == MT_CITADEL)
- cprintf("type=%d\n", TheMessage->cm_format_type);
+ /* Tell the client which format type we're using. If this is a
+ * MIME message, *lie* about it and tell the user it's fixed-format.
+ */
+ if (mode == MT_CITADEL) {
+ if (TheMessage->cm_format_type == 4)
+ cprintf("type=1\n");
+ else
+ cprintf("type=%d\n", TheMessage->cm_format_type);
+ }
+ /* nhdr=yes means that we're only displaying headers, no body */
if ((TheMessage->cm_anon_type == MES_ANON) && (mode == MT_CITADEL)) {
cprintf("nhdr=yes\n");
}
+
/* begin header processing loop for Citadel message format */
if ((mode == MT_CITADEL) || (mode == MT_MIME)) {
cprintf("subj=%s\n", TheMessage->cm_fields['U']);
}
}
+
/* begin header processing loop for RFC822 transfer format */
strcpy(suser, "");
}
}
}
+
if (mode == MT_RFC822) {
if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
cprintf("Message-ID: <%s@%s>\n", mid, snode);
PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
- cprintf("From: %s@%s (%s)\n",
- suser, snode, luser);
+ cprintf("From: %s@%s (%s)\n", suser, snode, luser);
cprintf("Organization: %s\n", lnode);
}
+
/* end header processing loop ... at this point, we're in the text */
mptr = TheMessage->cm_fields['M'];
- /* do some sort of MIME output */
- if (TheMessage->cm_format_type == 4) {
- if ((mode == MT_CITADEL) || (mode == MT_MIME)) {
+ /* Tell the client about the MIME parts in this message */
+ if (TheMessage->cm_format_type == 4) { /* legacy textual dump */
+ if (mode == MT_CITADEL) {
mime_parser(mptr, NULL, *list_this_part);
}
- if (mode == MT_MIME) { /* If MT_MIME then it's parts only */
+ else if (mode == MT_MIME) { /* list parts only */
+ mime_parser(mptr, NULL, *list_this_part);
cprintf("000\n");
CtdlFreeMessage(TheMessage);
return;
}
}
+
if (headers_only) {
cprintf("000\n");
CtdlFreeMessage(TheMessage);
return;
}
+
/* signify start of msg text */
if (mode == MT_CITADEL)
cprintf("text\n");
if (strlen(buf) > 0)
cprintf("%s\n", buf);
}
+
/* 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
if (TheMessage->cm_format_type == 0) {
memfmout(80, mptr, 0);
}
+
/* 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 == 4) {
+ CtdlAllocUserData(SYM_MA_INFO, sizeof(struct ma_info));
+ memset(ma, 0, sizeof(struct ma_info));
mime_parser(mptr, NULL, *fixed_output);
}
+
/* now we're done */
cprintf("000\n");
CtdlFreeMessage(TheMessage);
void cmd_msg3(char *cmdbuf)
{
long msgnum;
- struct cdbdata *dmsgtext;
+ struct CtdlMessage *msg;
+ struct sermsgret smr;
if (CC->internal_pgm == 0) {
cprintf("%d This command is for internal programs only.\n",
}
msgnum = extract_long(cmdbuf, 0);
+ msg = CtdlFetchMessage(msgnum);
+ if (msg == NULL) {
+ cprintf("%d Message %ld not found.\n",
+ ERROR, msgnum);
+ return;
+ }
- dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
- if (dmsgtext == NULL) {
- cprintf("%d Message %ld not found\n", ERROR, msgnum);
+ serialize_message(&smr, msg);
+ CtdlFreeMessage(msg);
+
+ if (smr.len == 0) {
+ cprintf("%d Unable to serialize message\n",
+ ERROR+INTERNAL_ERROR);
+ return;
}
- cprintf("%d %ld\n", BINARY_FOLLOWS, dmsgtext->len);
- client_write(dmsgtext->ptr, dmsgtext->len);
- cdb_free(dmsgtext);
+ cprintf("%d %ld\n", BINARY_FOLLOWS, smr.len);
+ client_write(smr.ser, smr.len);
+ phree(smr.ser);
}
/*
* Message base operation to send a message to the master file
* (returns new message number)
+ *
+ * This is the back end for CtdlSaveMsg() and should not be directly
+ * called by server-side modules.
+ *
*/
-long send_message(char *message_in_memory,
- /* pointer to buffer */
- size_t message_length, /* length of buffer */
- int generate_id)
-{ /* 1 to generate an I field */
-
+long send_message(struct CtdlMessage *msg, /* pointer to buffer */
+ int generate_id, /* generate 'I' field? */
+ FILE *save_a_copy) /* save a copy to disk? */
+{
long newmsgid;
- char *actual_message;
- size_t actual_length;
long retval;
char msgidbuf[32];
+ struct sermsgret smr;
/* Get a new message number */
newmsgid = get_new_message_number();
+ sprintf(msgidbuf, "%ld", newmsgid);
if (generate_id) {
- sprintf(msgidbuf, "I%ld", newmsgid);
- actual_length = message_length + strlen(msgidbuf) + 1;
- actual_message = mallok(actual_length);
- memcpy(actual_message, message_in_memory, 3);
- memcpy(&actual_message[3], msgidbuf, (strlen(msgidbuf) + 1));
- memcpy(&actual_message[strlen(msgidbuf) + 4],
- &message_in_memory[3], message_length - 3);
- } else {
- actual_message = message_in_memory;
- actual_length = message_length;
+ msg->cm_fields['I'] = strdoop(msgidbuf);
}
+
+ serialize_message(&smr, msg);
+
+ if (smr.len == 0) {
+ cprintf("%d Unable to serialize message\n",
+ ERROR+INTERNAL_ERROR);
+ return (-1L);
+ }
/* Write our little bundle of joy into the message base */
begin_critical_section(S_MSGMAIN);
if (cdb_store(CDB_MSGMAIN, &newmsgid, sizeof(long),
- actual_message, actual_length) < 0) {
+ smr.ser, smr.len) < 0) {
lprintf(2, "Can't store message\n");
retval = 0L;
} else {
}
end_critical_section(S_MSGMAIN);
- if (generate_id) {
- phree(actual_message);
+ /* If the caller specified that a copy should be saved to a particular
+ * file handle, do that now too.
+ */
+ if (save_a_copy != NULL) {
+ fwrite(smr.ser, smr.len, 1, save_a_copy);
}
- /* Finally, return the pointers */
- return (retval);
+
+ /* Free the memory we used for the serialized message */
+ phree(smr.ser);
+
+ /* Return the *local* message ID to the caller
+ * (even if we're storing an incoming network message)
+ */
+ return(retval);
}
/*
- * this is a simple file copy routine.
+ * Serialize a struct CtdlMessage into the format used on disk and network.
+ *
+ * This function returns a "struct sermsgret" (defined in msgbase.h) which
+ * contains the length of the serialized message and a pointer to the
+ * serialized message in memory. THE LATTER MUST BE FREED BY THE CALLER.
*/
-void copy_file(char *from, char *to)
+void serialize_message(struct sermsgret *ret, /* return values */
+ struct CtdlMessage *msg) /* unserialized msg */
{
- FILE *ffp, *tfp;
- int a;
+ size_t wlen;
+ int i;
+ static char *forder = FORDER;
- ffp = fopen(from, "r");
- if (ffp == NULL)
- return;
- tfp = fopen(to, "w");
- if (tfp == NULL) {
- fclose(ffp);
+ lprintf(9, "serialize_message() called\n");
+
+ if (is_valid_message(msg) == 0) return; /* self check */
+
+ lprintf(9, "magic number check OK.\n");
+
+ ret->len = 3;
+ for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL)
+ ret->len = ret->len +
+ strlen(msg->cm_fields[(int)forder[i]]) + 2;
+
+ lprintf(9, "message is %d bytes\n", ret->len);
+
+ lprintf(9, "calling malloc\n");
+ ret->ser = mallok(ret->len);
+ if (ret->ser == NULL) {
+ ret->len = 0;
return;
}
- while (a = getc(ffp), a >= 0) {
- putc(a, tfp);
+
+ ret->ser[0] = 0xFF;
+ ret->ser[1] = msg->cm_anon_type;
+ ret->ser[2] = msg->cm_format_type;
+ wlen = 3;
+ lprintf(9, "stuff\n");
+
+ for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
+ ret->ser[wlen++] = (char)forder[i];
+ strcpy(&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
+ wlen = wlen + strlen(msg->cm_fields[(int)forder[i]]) + 1;
}
- fclose(ffp);
- fclose(tfp);
+ if (ret->len != wlen) lprintf(3, "ERROR: len=%d wlen=%d\n",
+ ret->len, wlen);
+
return;
}
/*
- * message base operation to save a message and install its pointers
+ * Save a message to disk
*/
-void save_message(char *mtmp, /* file containing proper message */
- char *rec, /* Recipient (if mail) */
- char *force, /* if non-zero length, force a room */
- int mailtype, /* local or remote type, see citadel.h */
- int generate_id)
-{ /* set to 1 to generate an 'I' field */
+void CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
+ char *rec, /* Recipient (mail) */
+ char *force, /* force a particular room? */
+ int mailtype, /* local or remote type */
+ int generate_id) /* 1 = generate 'I' field */
+{
char aaa[100];
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
char force_room[ROOMNAMELEN];
char content_type[256]; /* We have to learn this */
- char ch, rch;
char recipient[256];
long newmsgid;
- char *message_in_memory;
char *mptr;
- struct stat statbuf;
- size_t templen;
- FILE *fp;
struct usersupp userbuf;
int a;
- static int seqnum = 0;
int successful_local_recipients = 0;
struct quickroom qtemp;
struct SuppMsgInfo smi;
+ FILE *network_fp = NULL;
+ static int seqnum = 1;
+
+ lprintf(9, "CtdlSaveMsg() called\n");
+ if (is_valid_message(msg) == 0) return; /* self check */
+
+ /* If this message has no timestamp, we take the liberty of
+ * giving it one, right now.
+ */
+ if (msg->cm_fields['T'] == NULL) {
+ sprintf(aaa, "%ld", time(NULL));
+ msg->cm_fields['T'] = strdoop(aaa);
+ }
- lprintf(9, "save_message(%s,%s,%s,%d,%d)\n",
- mtmp, rec, force, mailtype, generate_id);
+ /* If this message has no path, we generate one.
+ */
+ if (msg->cm_fields['P'] == NULL) {
+ msg->cm_fields['P'] = strdoop(msg->cm_fields['A']);
+ for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
+ if (isspace(msg->cm_fields['P'][a])) {
+ msg->cm_fields['P'][a] = ' ';
+ }
+ }
+ }
strcpy(force_room, force);
if (!isprint(recipient[a]))
strcpy(&recipient[a], &recipient[a + 1]);
- /* Measure the message */
- stat(mtmp, &statbuf);
- templen = statbuf.st_size;
-
- /* Now read it into memory */
- message_in_memory = (char *) mallok(templen);
- if (message_in_memory == NULL) {
- lprintf(2, "Can't allocate memory to save message!\n");
- return;
- }
- fp = fopen(mtmp, "rb");
- fread(message_in_memory, templen, 1, fp);
- fclose(fp);
-
/* Learn about what's inside, because it's what's inside that counts */
- mptr = message_in_memory;
- ++mptr; /* advance past 0xFF header */
- ++mptr; /* advance past anon flag */
- ch = *mptr++;
- switch (ch) {
+
+ switch (msg->cm_format_type) {
case 0:
strcpy(content_type, "text/x-citadel-variformat");
break;
case 4:
strcpy(content_type, "text/plain");
/* advance past header fields */
- while (ch = *mptr++, (ch != 'M' && ch != 0)) {
- do {
- rch = *mptr++;
- } while (rch > 0);
- }
+ mptr = msg->cm_fields['M'];
a = strlen(mptr);
while (--a) {
if (!strncasecmp(mptr, "Content-type: ", 14)) {
safestrncpy(content_type, mptr,
sizeof(content_type));
- lprintf(9, "%s\n", content_type);
strcpy(content_type, &content_type[14]);
for (a = 0; a < strlen(content_type); ++a)
if ((content_type[a] == ';')
++mptr;
}
}
- lprintf(9, "Content type is <%s>\n", content_type);
+
+ /* Network mail - send a copy to the network program. */
+ if ((strlen(recipient) > 0) && (mailtype != MES_LOCAL)) {
+ sprintf(aaa, "./network/spoolin/netmail.%04lx.%04x.%04x",
+ (long) getpid(), CC->cs_pid, ++seqnum);
+ lprintf(9, "Saving a copy to %s\n", aaa);
+ network_fp = fopen(aaa, "ab+");
+ if (network_fp == NULL)
+ lprintf(2, "ERROR: %s\n", strerror(errno));
+ }
/* Save it to disk */
- newmsgid = send_message(message_in_memory, templen, generate_id);
- phree(message_in_memory);
+ newmsgid = send_message(msg, generate_id, network_fp);
+ if (network_fp != NULL) {
+ fclose(network_fp);
+ system("exec nohup ./netproc -i >/dev/null 2>&1 &");
+ }
if (newmsgid <= 0L)
return;
strcpy(actual_rm, config.c_twitroom);
}
/* ...or if this message is destined for Aide> then go there. */
- lprintf(9, "actual room forcing loop\n");
if (strlen(force_room) > 0) {
strcpy(hold_rm, actual_rm);
strcpy(actual_rm, force_room);
lputroom(&CC->quickroom);
++successful_local_recipients;
}
- /* Network mail - send a copy to the network program. */
- if ((strlen(recipient) > 0) && (mailtype != MES_LOCAL)) {
- sprintf(aaa, "./network/spoolin/netmail.%04lx.%04x.%04x",
- (long) getpid(), CC->cs_pid, ++seqnum);
- copy_file(mtmp, aaa);
- system("exec nohup ./netproc -i >/dev/null 2>&1 &");
- }
+
/* Bump this user's messages posted counter. */
lgetuser(&CC->usersupp, CC->curr_user);
CC->usersupp.posted = CC->usersupp.posted + 1;
if ((strlen(recipient) > 0) && (mailtype == MES_LOCAL)) {
if (getuser(&userbuf, recipient) == 0) {
MailboxName(actual_rm, &userbuf, MAILROOM);
- lprintf(9, "Targeting mailbox: <%s>\n", actual_rm);
if (lgetroom(&qtemp, actual_rm) == 0) {
qtemp.QRhighest =
AddMessageToRoom(&qtemp, newmsgid);
if (strlen(hold_rm) > 0) {
usergoto(hold_rm, 0);
}
- unlink(mtmp); /* delete the temporary file */
/* Write a supplemental message info record. This doesn't have to
* be a critical section because nobody else knows about this message
}
+
/*
- * Generate an administrative message and post it in the Aide> room.
+ * Convenience function for generating small administrative messages.
*/
-void aide_message(char *text)
+void quickie_message(char *from, char *room, char *text)
{
- FILE *fp;
-
- fp = fopen(CC->temp, "wb");
- fprintf(fp, "%c%c%c", 255, MES_NORMAL, 0);
- fprintf(fp, "Psysop%c", 0);
- fprintf(fp, "T%ld%c", (long) time(NULL), 0);
- fprintf(fp, "ACitadel%c", 0);
- fprintf(fp, "OAide%c", 0);
- fprintf(fp, "N%s%c", NODENAME, 0);
- fprintf(fp, "M%s\n%c", text, 0);
- fclose(fp);
- save_message(CC->temp, "", AIDEROOM, MES_LOCAL, 1);
+ struct CtdlMessage *msg;
+
+ msg = mallok(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = MES_NORMAL;
+ msg->cm_format_type = 0;
+ msg->cm_fields['A'] = strdoop(from);
+ msg->cm_fields['O'] = strdoop(room);
+ msg->cm_fields['N'] = strdoop(NODENAME);
+ msg->cm_fields['M'] = strdoop(text);
+
+ CtdlSaveMsg(msg, "", room, MES_LOCAL, 1);
+ CtdlFreeMessage(msg);
syslog(LOG_NOTICE, text);
-} /*
+}
- * Build a binary message to be saved on disk.
- */ void make_message(
- char *filename, /* temporary file name */
- struct usersupp *author, /* author's usersupp structure */
- char *recipient, /* NULL if it's not mail */
- char *room, /* room where it's going */
- int type, /* see MES_ types in header file */
- int net_type, /* see MES_ types in header file */
- int format_type, /* local or remote (see citadel.h) */
- char *fake_name)
-{ /* who we're masquerading as */
- FILE *fp;
+/*
+ * Build a binary message to be saved on disk.
+ */
+
+struct CtdlMessage *make_message(
+ struct usersupp *author, /* author's usersupp structure */
+ char *recipient, /* NULL if it's not mail */
+ char *room, /* room where it's going */
+ int type, /* see MES_ types in header file */
+ int net_type, /* see MES_ types in header file */
+ int format_type, /* local or remote (see citadel.h) */
+ char *fake_name) /* who we're masquerading as */
+{
+
int a;
- time_t now;
char dest_node[32];
char buf[256];
+ size_t message_len = 0;
+ size_t buffer_len = 0;
+ char *ptr;
+ struct CtdlMessage *msg;
+
+ msg = mallok(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = type;
+ msg->cm_format_type = format_type;
/* Don't confuse the poor folks if it's not routed mail. */
strcpy(dest_node, "");
-
/* If net_type is MES_BINARY, split out the destination node. */
if (net_type == MES_BINARY) {
strcpy(dest_node, NODENAME);
}
}
}
- /* if net_type is MES_INTERNET, set the dest node to 'internet' */ if (net_type == MES_INTERNET) {
+
+ /* if net_type is MES_INTERNET, set the dest node to 'internet' */
+ if (net_type == MES_INTERNET) {
strcpy(dest_node, "internet");
}
+
while (isspace(recipient[strlen(recipient) - 1]))
recipient[strlen(recipient) - 1] = 0;
- time(&now);
- fp = fopen(filename, "w");
- putc(255, fp);
- putc(type, fp); /* Normal or anonymous, see MES_ flags */
- putc(format_type, fp); /* Formatted or unformatted */
- fprintf(fp, "Pcit%ld%c", author->usernum, 0); /* path */
- fprintf(fp, "T%ld%c", (long) now, 0); /* date/time */
- if (fake_name[0])
- fprintf(fp, "A%s%c", fake_name, 0);
+ sprintf(buf, "cit%ld", author->usernum); /* Path */
+ msg->cm_fields['P'] = strdoop(buf);
+
+ sprintf(buf, "%ld", time(NULL)); /* timestamp */
+ msg->cm_fields['T'] = strdoop(buf);
+
+ if (fake_name[0]) /* author */
+ msg->cm_fields['A'] = strdoop(fake_name);
else
- fprintf(fp, "A%s%c", author->fullname, 0); /* author */
+ msg->cm_fields['A'] = strdoop(author->fullname);
- if (CC->quickroom.QRflags & QR_MAILBOX) { /* room */
- fprintf(fp, "O%s%c", &CC->quickroom.QRname[11], 0);
- } else {
- fprintf(fp, "O%s%c", CC->quickroom.QRname, 0);
- }
+ if (CC->quickroom.QRflags & QR_MAILBOX) /* room */
+ msg->cm_fields['O'] = strdoop(&CC->quickroom.QRname[11]);
+ else
+ msg->cm_fields['O'] = strdoop(CC->quickroom.QRname);
- fprintf(fp, "N%s%c", NODENAME, 0); /* nodename */
- fprintf(fp, "H%s%c", HUMANNODE, 0); /* human nodename */
+ msg->cm_fields['N'] = strdoop(NODENAME); /* nodename */
+ msg->cm_fields['H'] = strdoop(HUMANNODE); /* hnodename */
if (recipient[0] != 0)
- fprintf(fp, "R%s%c", recipient, 0);
+ msg->cm_fields['R'] = strdoop(recipient);
if (dest_node[0] != 0)
- fprintf(fp, "D%s%c", dest_node, 0);
+ msg->cm_fields['D'] = strdoop(dest_node);
- putc('M', fp);
+ msg->cm_fields['M'] = mallok(4096);
+ if (msg->cm_fields['M'] == NULL) {
+ while (client_gets(buf), strcmp(buf, "000")) ;; /* flush */
+ return(msg);
+ } else {
+ buffer_len = 4096;
+ msg->cm_fields['M'][0] = 0;
+ message_len = 0;
+ }
+ /* read in the lines of message text one by one */
while (client_gets(buf), strcmp(buf, "000")) {
- fprintf(fp, "%s\n", buf);
+
+ /* augment the buffer if we have to */
+ if ((message_len + strlen(buf) + 2) > buffer_len) {
+ ptr = reallok(msg->cm_fields['M'], (buffer_len * 2) );
+ if (ptr == NULL) { /* flush if can't allocate */
+ while (client_gets(buf), strcmp(buf, "000")) ;;
+ return(msg);
+ } else {
+ buffer_len = (buffer_len * 2);
+ msg->cm_fields['M'] = ptr;
+ }
+ }
+
+ strcat(msg->cm_fields['M'], buf);
+ strcat(msg->cm_fields['M'], "\n");
+
+ /* if we've hit the max msg length, flush the rest */
+ if (message_len >= config.c_maxmsglen) {
+ while (client_gets(buf), strcmp(buf, "000")) ;;
+ return(msg);
+ }
}
- putc(0, fp);
- fclose(fp);
+
+ return(msg);
}
/*
- * message entry - mode 0 (normal) <bc>
+ * message entry - mode 0 (normal)
*/
void cmd_ent0(char *entargs)
{
char recipient[256];
int anon_flag = 0;
int format_type = 0;
- char newusername[256]; /* <bc> */
-
+ char newusername[256];
+ struct CtdlMessage *msg;
int a, b;
int e = 0;
int mtsflag = 0;
mtsflag = 0;
- if (post == 2) { /* <bc> */
+ if (post == 2) {
if (CC->usersupp.axlevel < 6) {
- cprintf("%d You don't have permission to do an aide post.\n",
+ cprintf("%d You don't have permission to masquerade.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
strcpy(buf, recipient);
} else
strcpy(buf, "sysop");
- lprintf(9, "calling alias()\n");
e = alias(buf); /* alias and mail type */
- lprintf(9, "alias() returned %d\n", e);
if ((buf[0] == 0) || (e == MES_ERROR)) {
cprintf("%d Unknown address - cannot send message.\n",
ERROR + NO_SUCH_USER);
return;
}
/* Check to make sure the user exists; also get the correct
- * upper/lower casing of the name.
+ * upper/lower casing of the name.
*/
a = getuser(&tempUS, buf);
if (a != 0) {
}
strcpy(buf, tempUS.fullname);
}
- SKFALL:b = MES_NORMAL;
+
+SKFALL: b = MES_NORMAL;
if (CC->quickroom.QRflags & QR_ANONONLY)
b = MES_ANON;
if (CC->quickroom.QRflags & QR_ANONOPT) {
cprintf("%d %s\n", OK, buf);
return;
}
+
cprintf("%d send message\n", SEND_LISTING);
+
+ /* Read in the message from the client. */
if (CC->fake_postname[0])
- make_message(CC->temp, &CC->usersupp, buf, CC->quickroom.QRname, b, e, format_type, CC->fake_postname);
+ msg = make_message(&CC->usersupp, buf,
+ CC->quickroom.QRname, b, e, format_type,
+ CC->fake_postname);
else if (CC->fake_username[0])
- make_message(CC->temp, &CC->usersupp, buf, CC->quickroom.QRname, b, e, format_type, CC->fake_username);
+ msg = make_message(&CC->usersupp, buf,
+ CC->quickroom.QRname, b, e, format_type,
+ CC->fake_username);
else
- make_message(CC->temp, &CC->usersupp, buf, CC->quickroom.QRname, b, e, format_type, "");
- save_message(CC->temp, buf, (mtsflag ? AIDEROOM : ""), e, 1);
+ msg = make_message(&CC->usersupp, buf,
+ CC->quickroom.QRname, b, e, format_type, "");
+
+ if (msg != NULL)
+ CtdlSaveMsg(msg, buf, (mtsflag ? AIDEROOM : ""), e, 1);
+ CtdlFreeMessage(msg);
CC->fake_postname[0] = '\0';
return;
}
ERROR);
return;
}
- /* See if there's a recipient, but make sure it's a real one */ extract(recp, entargs, 1);
+
+ /* See if there's a recipient, but make sure it's a real one */
+ extract(recp, entargs, 1);
for (a = 0; a < strlen(recp); ++a)
if (!isprint(recp[a]))
strcpy(&recp[a], &recp[a + 1]);
* FIX ... still need to implement delete by content type
*/
int CtdlDeleteMessages(char *room_name, /* which room */
- long dmsgnum, /* or "0" for any */
+ long dmsgnum, /* or "0" for any */
char *content_type /* or NULL for any */
)
{
}
cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
- lprintf(9, "doing mallok/memcpy loop\n");
if (cdbfr != NULL) {
msglist = mallok(cdbfr->len);
memcpy(msglist, cdbfr->ptr, cdbfr->len);
msglist, (num_msgs * sizeof(long)));
qrbuf.QRhighest = msglist[num_msgs - 1];
+ phree(msglist);
}
lputroom(&qrbuf);
lprintf(9, "%d message(s) deleted.\n", num_deleted);
delnum = (0L - msgnum);
cdb_delete(CDB_MSGMAIN, &delnum, 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 *tempfilename, /* Where to fetch it from */
- int is_mailbox, /* Private mailbox room? */
- int is_binary, /* Is encoding necessary? */
- int is_unique /* Del others of this type? */
-)
+/*
+ * 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 *tempfilename, /* Where to fetch it from */
+ int is_mailbox, /* Private mailbox room? */
+ int is_binary, /* Is encoding necessary? */
+ int is_unique /* Del others of this type? */
+ )
{
FILE *fp, *tempfp;