#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
+#include <ctype.h>
#include <signal.h>
#include <pwd.h>
#include <errno.h>
#include "tools.h"
#include "internet_addressing.h"
#include "user_ops.h"
+#include "parsedate.h"
+
/*
}
+/*
+ * Unfold a multi-line field into a single line, removing multi-whitespaces
+ */
+void unfold_rfc822_field(char *field) {
+ int i;
+ int quote = 0;
+
+ striplt(field); /* remove leading/trailing whitespace */
+
+ /* convert non-space whitespace to spaces, and remove double blanks */
+ for (i=0; i<strlen(field); ++i) {
+ if (field[i]=='\"') quote = 1 - quote;
+ if (!quote) {
+ if (isspace(field[i])) field[i] = ' ';
+ while (isspace(field[i]) && isspace(field[i+1])) {
+ strcpy(&field[i+1], &field[i+2]);
+ }
+ }
+ }
+}
+
/*
}
-
/*
* Convert an Internet email address to a Citadel user/host combination
*/
+/*
+ * convert_field() is a helper function for convert_internet_message().
+ * Given start/end positions for an rfc822 field, it converts it to a Citadel
+ * field if it wants to, and unfolds it if necessary.
+ *
+ * Returns 1 if the field was converted and inserted into the Citadel message
+ * structure, implying that the source field should be removed from the
+ * message text.
+ */
+int convert_field(struct CtdlMessage *msg, int beg, int end) {
+ char *rfc822;
+ char *key, *value;
+ int i;
+ int colonpos = (-1);
+ int processed = 0;
+ char buf[256];
+ char *user, *node, *name;
+
+ rfc822 = msg->cm_fields['M']; /* M field contains rfc822 text */
+ for (i = end; i >= beg; --i) {
+ if (rfc822[i] == ':') colonpos = i;
+ }
+
+ if (colonpos < 0) return(0); /* no colon? not a valid header line */
+
+ key = mallok((end - beg) + 2);
+ safestrncpy(key, &rfc822[beg], (end-beg)+1);
+ key[colonpos - beg] = 0;
+ value = &key[(colonpos - beg) + 1];
+ unfold_rfc822_field(value);
+
+ lprintf(9, "Key=<%s> Value=<%s>\n", key, value);
+
+ /* Here's the big rfc822-to-citadel loop. */
+
+ if (!strcasecmp(key, "Date")) {
+ sprintf(buf, "%ld", parsedate(value) );
+ if (msg->cm_fields['T'] == NULL)
+ msg->cm_fields['T'] = strdoop(buf);
+ processed = 1;
+ }
+
+ else if (!strcasecmp(key, "From")) {
+ user = mallok(strlen(value));
+ node = mallok(strlen(value));
+ name = mallok(strlen(value));
+ process_rfc822_addr(value, user, node, name);
+ lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
+ if (msg->cm_fields['A'] == NULL)
+ msg->cm_fields['A'] = user;
+ else
+ phree(user);
+ if (msg->cm_fields['N'] == NULL)
+ msg->cm_fields['N'] = node;
+ else
+ phree(node);
+ if (msg->cm_fields['H'] == NULL)
+ msg->cm_fields['H'] = name;
+ else
+ phree(name);
+ processed = 1;
+ }
+
+ else if (!strcasecmp(key, "Subject")) {
+ if (msg->cm_fields['U'] == NULL)
+ msg->cm_fields['U'] = strdoop(value);
+ processed = 1;
+ }
+
+ /* Clean up and move on. */
+ phree(key); /* Don't free 'value', it's actually the same buffer */
+ return(processed);
+}
+
/*
* Convert an RFC822 message (headers + body) to a CtdlMessage structure.
struct CtdlMessage *convert_internet_message(char *rfc822) {
struct CtdlMessage *msg;
- char *buf;
+ int pos, beg, end;
+ int done;
+ char buf[256];
+ int converted;
msg = mallok(sizeof(struct CtdlMessage));
if (msg == NULL) return msg;
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC; /* self check */
msg->cm_anon_type = 0; /* never anonymous */
- msg->cm_format_type = 4; /* always MIME */
+ msg->cm_format_type = FMT_RFC822; /* internet message */
msg->cm_fields['M'] = rfc822;
- /* FIX there's plenty to do here. */
+ lprintf(9, "Unconverted RFC822 message length = %d\n", strlen(rfc822));
+ pos = 0;
+ done = 0;
+
+ while (!done) {
+
+ /* Locate beginning and end of field, keeping in mind that
+ * some fields might be multiline
+ */
+ beg = pos;
+ end = (-1);
+ for (pos=beg; ((pos<=strlen(rfc822))&&(end<0)); ++pos) {
+ if ((rfc822[pos]=='\n')
+ && (!isspace(rfc822[pos+1]))) {
+ end = pos;
+ }
+ if ( (rfc822[pos]=='\n') /* done w. headers? */
+ && ( (rfc822[pos+1]=='\n')
+ ||(rfc822[pos+1]=='\r'))) {
+ end = pos;
+ done = 1;
+ }
+
+ }
+
+ /* At this point we have a field. Are we interested in it? */
+ converted = convert_field(msg, beg, end);
+ /******
+ if (converted) {
+ strcpy(&rfc822[beg], &rfc822[pos]);
+ pos = beg;
+ }
+ ********/
+
+ /* If we've hit the end of the message, bail out */
+ if (pos > strlen(rfc822)) done = 1;
+ }
- /* Follow-up sanity check. */
+ /* Follow-up sanity checks... */
/* If there's no timestamp on this message, set it to now. */
if (msg->cm_fields['T'] == NULL) {
msg->cm_fields['T'] = strdoop(buf);
}
+ lprintf(9, "RFC822 length remaining after conversion = %d\n",
+ strlen(rfc822));
return msg;
}
+