X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=32e70af1a1a73f034025c0e03152b0fa1ff12038;hb=e6219cc9b27e56e3b41170f864da30fa7b13ee01;hp=c96d722e12ccd2bf4b0b5be632a5d1297c0e1a13;hpb=76fab287198d1da021be18e608717bacb953e169;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index c96d722e1..32e70af1a 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This file contains functions which handle the mapping of Internet addresses
  * to users on the Citadel system.
  */
@@ -43,40 +41,10 @@
 #include "room_ops.h"
 #include "parsedate.h"
 #include "database.h"
-
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
+#include "ctdl_module.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 
-/*
- * Wrapper around iconv_open()
- * Our version adds aliases for non-standard Microsoft charsets
- * such as 'MS950', aliasing them to names like 'CP950'
- *
- * tocode	Target encoding
- * fromcode	Source encoding
- */
-iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
-{
-	iconv_t ic = (iconv_t)(-1) ;
-	ic = iconv_open(tocode, fromcode);
-	if (ic == (iconv_t)(-1) ) {
-		char alias_fromcode[64];
-		if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) {
-			safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode);
-			alias_fromcode[0] = 'C';
-			alias_fromcode[1] = 'P';
-			ic = iconv_open(tocode, alias_fromcode);
-		}
-	}
-	return(ic);
-}
-
 #if 0
 /* This is the non-define version in case of s.b. needing to debug */
 inline void FindNextEnd (char *bptr, char *end)
@@ -141,7 +109,7 @@ void utf8ify_rfc822_string(char *buf) {
 	if (illegal_non_rfc2047_encoding) {
 		const char *default_header_charset = "iso-8859-1";
 		if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
-			ic = ctdl_iconv_open("UTF-8", default_header_charset);
+			ctdl_iconv_open("UTF-8", default_header_charset, &ic);
 			if (ic != (iconv_t)(-1) ) {
 				ibuf = malloc(1024);
 				isav = ibuf;
@@ -243,7 +211,7 @@ void utf8ify_rfc822_string(char *buf) {
 			ibuflen = strlen(istr);
 		}
 
-		ic = ctdl_iconv_open("UTF-8", charset);
+		ctdl_iconv_open("UTF-8", charset, &ic);
 		if (ic != (iconv_t)(-1) ) {
 			obuflen = 1024;
 			obuf = (char *) malloc(obuflen);
@@ -319,6 +287,7 @@ int CtdlHostAlias(char *fqdn) {
 	int i;
 	char buf[256];
 	char host[256], type[256];
+	int found = 0;
 
 	if (fqdn == NULL) return(hostalias_nomatch);
 	if (IsEmptyStr(fqdn)) return(hostalias_nomatch);
@@ -333,18 +302,23 @@ int CtdlHostAlias(char *fqdn) {
 		extract_token(host, buf, 0, '|', sizeof host);
 		extract_token(type, buf, 1, '|', sizeof type);
 
-		if ( (!strcasecmp(type, "localhost"))
-		   && (!strcasecmp(fqdn, host)))
-			return(hostalias_localhost);
+		found = 0;
 
-		if ( (!strcasecmp(type, "directory"))
-		   && (!strcasecmp(fqdn, host)))
-			return(hostalias_directory);
+		/* Process these in a specific order, in case there are multiple matches.
+		 * We want directory to override masq, for example.
+		 */
 
-		if ( (!strcasecmp(type, "masqdomain"))
-		   && (!strcasecmp(fqdn, host)))
-			return(hostalias_masq);
+		if ( (!strcasecmp(type, "masqdomain")) && (!strcasecmp(fqdn, host))) {
+			found = hostalias_masq;
+		}
+		if ( (!strcasecmp(type, "localhost")) && (!strcasecmp(fqdn, host))) {
+			found = hostalias_localhost;
+		}
+		if ( (!strcasecmp(type, "directory")) && (!strcasecmp(fqdn, host))) {
+			found = hostalias_directory;
+		}
 
+		if (found) return(found);
 	}
 
 	return(hostalias_nomatch);
@@ -384,22 +358,54 @@ int fuzzy_match(struct ctdluser *us, char *matchstring) {
 /*
  * Unfold a multi-line field into a single line, removing multi-whitespaces
  */
-void unfold_rfc822_field(char *field) {
-	int i;
+void unfold_rfc822_field(char **field, char **FieldEnd) 
+{
 	int quote = 0;
+	char *pField = *field;
+	char *sField;
+	char *pFieldEnd = *FieldEnd;
 
-	striplt(field);		/* remove leading/trailing whitespace */
+	while (isspace(*pField))
+		pField++;
+	/* remove leading/trailing whitespace */
+	;
 
+	while (isspace(*pFieldEnd))
+		pFieldEnd --;
+
+	*FieldEnd = pFieldEnd;
 	/* 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]);
+	for (sField = *field = pField; 
+	     sField < pFieldEnd; 
+	     pField++, sField++)
+	{
+		if ((*sField=='\r') || (*sField=='\n')) {
+		    sField++;
+		    if  (*sField == '\n')
+			sField++;
+		    *pField = *sField;
+		}
+		else {
+			if (*sField=='\"') quote = 1 - quote;
+			if (!quote) {
+				if (isspace(*sField))
+				{
+					*pField = ' ';
+					pField++;
+					sField++;
+					
+					while ((sField < pFieldEnd) && 
+					       isspace(*sField))
+						sField++;
+					*pField = *sField;
+				}
+				else *pField = *sField;
 			}
+			else *pField = *sField;
 		}
 	}
+	*pField = '\0';
+	*FieldEnd = pField - 1;
 }
 
 
@@ -540,31 +546,37 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
  * 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 convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
+	char *key, *value, *valueend;
+	long len;
+	const char *pos;
 	int i;
-	int colonpos = (-1);
+	const char *colonpos = NULL;
 	int processed = 0;
-	char buf[SIZ];
 	char user[1024];
 	char node[1024];
 	char name[1024];
 	char addr[1024];
 	time_t parsed_date;
+	long valuelen;
 
-	rfc822 = msg->cm_fields['M'];	/* M field contains rfc822 text */
-	for (i = end; i >= beg; --i) {
-		if (rfc822[i] == ':') colonpos = i;
+	for (pos = end; pos >= beg; pos--) {
+		if (*pos == ':') colonpos = pos;
 	}
 
-	if (colonpos < 0) return(0);	/* no colon? not a valid header line */
+	if (colonpos == NULL) return(0);	/* no colon? not a valid header line */
 
-	key = malloc((end - beg) + 2);
-	safestrncpy(key, &rfc822[beg], (end-beg)+1);
-	key[colonpos - beg] = 0;
+	len = end - beg;
+	key = malloc(len + 2);
+	memcpy(key, beg, len + 1);
+	key[len] = '\0';
+	valueend = key + len;
+	* ( key + (colonpos - beg) ) = '\0';
 	value = &key[(colonpos - beg) + 1];
-	unfold_rfc822_field(value);
+/*	printf("Header: [%s]\nValue: [%s]\n", key, value); */
+	unfold_rfc822_field(&value, &valueend);
+	valuelen = valueend - value + 1;
+/*	printf("UnfoldedValue: [%s]\n", value); */
 
 	/*
 	 * Here's the big rfc822-to-citadel loop.
@@ -576,87 +588,100 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
 	if (!strcasecmp(key, "Date")) {
 		parsed_date = parsedate(value);
 		if (parsed_date < 0L) parsed_date = time(NULL);
-		snprintf(buf, sizeof buf, "%ld", (long)parsed_date );
-		if (msg->cm_fields['T'] == NULL)
-			msg->cm_fields['T'] = strdup(buf);
+
+		if (CM_IsEmpty(msg, eTimestamp))
+			CM_SetFieldLONG(msg, eTimestamp, parsed_date);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "From")) {
 		process_rfc822_addr(value, user, node, name);
-		CtdlLogPrintf(CTDL_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
-		snprintf(addr, sizeof addr, "%s@%s", user, node);
-		if (msg->cm_fields['A'] == NULL)
-			msg->cm_fields['A'] = strdup(name);
-		processed = 1;
-		if (msg->cm_fields['F'] == NULL)
-			msg->cm_fields['F'] = strdup(addr);
+		syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
+		snprintf(addr, sizeof(addr), "%s@%s", user, node);
+		if (CM_IsEmpty(msg, eAuthor))
+			CM_SetField(msg, eAuthor, name, strlen(name));
+		if (CM_IsEmpty(msg, erFc822Addr))
+			CM_SetField(msg, erFc822Addr, addr, strlen(addr));
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Subject")) {
-		if (msg->cm_fields['U'] == NULL)
-			msg->cm_fields['U'] = strdup(value);
+		if (CM_IsEmpty(msg, eMsgSubject))
+			CM_SetField(msg, eMsgSubject, value, valuelen);
+		processed = 1;
+	}
+
+	else if (!strcasecmp(key, "List-ID")) {
+		if (CM_IsEmpty(msg, eListID))
+			CM_SetField(msg, eListID, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "To")) {
-		if (msg->cm_fields['R'] == NULL)
-			msg->cm_fields['R'] = strdup(value);
+		if (CM_IsEmpty(msg, eRecipient))
+			CM_SetField(msg, eRecipient, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "CC")) {
-		if (msg->cm_fields['Y'] == NULL)
-			msg->cm_fields['Y'] = strdup(value);
+		if (CM_IsEmpty(msg, eCarbonCopY))
+			CM_SetField(msg, eCarbonCopY, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Message-ID")) {
-		if (msg->cm_fields['I'] != NULL) {
-			CtdlLogPrintf(CTDL_WARNING, "duplicate message id\n");
+		if (!CM_IsEmpty(msg, emessageId)) {
+			syslog(LOG_WARNING, "duplicate message id\n");
 		}
+		else {
+			char *pValue;
+			long pValueLen;
 
-		if (msg->cm_fields['I'] == NULL) {
-			msg->cm_fields['I'] = strdup(value);
-
+			pValue = value;
+			pValueLen = valuelen;
 			/* Strip angle brackets */
-			while (haschar(msg->cm_fields['I'], '<') > 0) {
-				strcpy(&msg->cm_fields['I'][0],
-					&msg->cm_fields['I'][1]);
+			while (haschar(pValue, '<') > 0) {
+				pValue ++;
+				pValueLen --;
 			}
-			for (i = 0; i<strlen(msg->cm_fields['I']); ++i)
-				if (msg->cm_fields['I'][i] == '>')
-					msg->cm_fields['I'][i] = 0;
+
+			for (i = 0; i <= pValueLen; ++i)
+				if (pValue[i] == '>') {
+					pValueLen = i;
+					break;
+				}
+
+			CM_SetField(msg, emessageId, pValue, pValueLen);
 		}
 
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Return-Path")) {
-		if (msg->cm_fields['P'] == NULL)
-			msg->cm_fields['P'] = strdup(value);
+		if (CM_IsEmpty(msg, eMessagePath))
+			CM_SetField(msg, eMessagePath, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Envelope-To")) {
-		if (msg->cm_fields['V'] == NULL)
-			msg->cm_fields['V'] = strdup(value);
+		if (CM_IsEmpty(msg, eenVelopeTo))
+			CM_SetField(msg, eenVelopeTo, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "References")) {
-		if (msg->cm_fields['W'] != NULL) {
-			free(msg->cm_fields['W']);
-		}
-		msg->cm_fields['W'] = strdup(value);
+		CM_SetField(msg, eWeferences, value, valuelen);
+		processed = 1;
+	}
+
+	else if (!strcasecmp(key, "Reply-To")) {
+		CM_SetField(msg, eReplyTo, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "In-reply-to")) {
-		if (msg->cm_fields['W'] == NULL) {		/* References: supersedes In-reply-to: */
-			msg->cm_fields['W'] = strdup(value);
-		}
+		if (CM_IsEmpty(msg, eWeferences)) /* References: supersedes In-reply-to: */
+			CM_SetField(msg, eWeferences, value, valuelen);
 		processed = 1;
 	}
 
@@ -664,7 +689,7 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
 
 	/* Clean up and move on. */
 	free(key);	/* Don't free 'value', it's actually the same buffer */
-	return(processed);
+	return processed;
 }
 
 
@@ -711,12 +736,20 @@ void convert_references_to_wefewences(char *str) {
  * again.
  */
 struct CtdlMessage *convert_internet_message(char *rfc822) {
+	StrBuf *RFCBuf = NewStrBufPlain(rfc822, -1);
+	free (rfc822);
+	return convert_internet_message_buf(&RFCBuf);
+}
+
 
+
+struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
+{
 	struct CtdlMessage *msg;
-	int pos, beg, end, msglen;
-	int done;
-	char buf[SIZ];
+	const char *pos, *beg, *end, *totalend;
+	int done, alldone = 0;
 	int converted;
+	StrBuf *OtherHeaders;
 
 	msg = malloc(sizeof(struct CtdlMessage));
 	if (msg == NULL) return msg;
@@ -725,36 +758,39 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 	msg->cm_magic = CTDLMESSAGE_MAGIC;	/* self check */
 	msg->cm_anon_type = 0;			/* never anonymous */
 	msg->cm_format_type = FMT_RFC822;	/* internet message */
-	msg->cm_fields['M'] = rfc822;
 
-	pos = 0;
+	pos = ChrPtr(*rfc822);
+	totalend = pos + StrLength(*rfc822);
 	done = 0;
+	OtherHeaders = NewStrBufPlain(NULL, StrLength(*rfc822));
 
-	while (!done) {
+	while (!alldone) {
 
 		/* Locate beginning and end of field, keeping in mind that
 		 * some fields might be multiline
 		 */
-		beg = pos;
-		end = (-1);
+		end = beg = pos;
 
-		msglen = strlen(rfc822);	
-		while ( (end < 0) && (done == 0) ) {
+		while ((end < totalend) && 
+		       (end == beg) && 
+		       (done == 0) ) 
+		{
 
-			if ((rfc822[pos]=='\n')
-			   && (!isspace(rfc822[pos+1]))) {
+			if ( (*pos=='\n') && ((*(pos+1))!=0x20) && ((*(pos+1))!=0x09) )
+			{
 				end = pos;
 			}
 
 			/* done with headers? */
-			if (   (rfc822[pos]=='\n')
-			   && ( (rfc822[pos+1]=='\n')
-			      ||(rfc822[pos+1]=='\r')) ) {
-				end = pos;
-				done = 1;
+			if ((*pos=='\n') &&
+			    ( (*(pos+1)=='\n') ||
+			      (*(pos+1)=='\r')) ) 
+			{
+				alldone = 1;
 			}
 
-			if (pos >= (msglen-1) ) {
+			if (pos >= (totalend - 1) )
+			{
 				end = pos;
 				done = 1;
 			}
@@ -767,28 +803,34 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 		converted = convert_field(msg, beg, end);
 
 		/* Strip the field out of the RFC822 header if we used it */
-		if (converted) {
-			strcpy(&rfc822[beg], &rfc822[pos]);
-			pos = beg;
+		if (!converted) {
+			StrBufAppendBufPlain(OtherHeaders, beg, end - beg, 0);
+			StrBufAppendBufPlain(OtherHeaders, HKEY("\n"), 0);
 		}
 
 		/* If we've hit the end of the message, bail out */
-		if (pos > strlen(rfc822)) done = 1;
+		if (pos >= totalend)
+			alldone = 1;
 	}
+	StrBufAppendBufPlain(OtherHeaders, HKEY("\n"), 0);
+	if (pos < totalend)
+		StrBufAppendBufPlain(OtherHeaders, pos, totalend - pos, 0);
+	FreeStrBuf(rfc822);
+	CM_SetAsFieldSB(msg, eMesageText, &OtherHeaders);
 
 	/* Follow-up sanity checks... */
 
 	/* If there's no timestamp on this message, set it to now. */
-	if (msg->cm_fields['T'] == NULL) {
-		snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
-		msg->cm_fields['T'] = strdup(buf);
+	if (CM_IsEmpty(msg, eTimestamp)) {
+		CM_SetFieldLONG(msg, eTimestamp, time(NULL));
 	}
 
 	/* If a W (references, or rather, Wefewences) field is present, we
 	 * have to convert it from RFC822 format to Citadel format.
 	 */
-	if (msg->cm_fields['W'] != NULL) {
-		convert_references_to_wefewences(msg->cm_fields['W']);
+	if (!CM_IsEmpty(msg, eWeferences)) {
+		/// todo: API!
+		convert_references_to_wefewences(msg->cm_fields[eWeferences]);
 	}
 
 	return msg;
@@ -803,11 +845,11 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
  * The caller is responsible for freeing the returned buffer.  If the requested
  * field is not present, or anything else goes wrong, it returns NULL.
  */
-char *rfc822_fetch_field(char *rfc822, char *fieldname) {
+char *rfc822_fetch_field(const char *rfc822, const char *fieldname) {
 	char *fieldbuf = NULL;
-	char *end_of_headers;
-	char *field_start;
-	char *ptr;
+	const char *end_of_headers;
+	const char *field_start;
+	const char *ptr;
 	char *cont;
 	char fieldhdr[SIZ];
 
@@ -818,13 +860,13 @@ char *rfc822_fetch_field(char *rfc822, char *fieldname) {
 	snprintf(fieldhdr, sizeof fieldhdr, "%s:", fieldname);
 
 	/* Locate the end of the headers, so we don't run past that point */
-	end_of_headers = bmstrcasestr(rfc822, "\n\r\n");
+	end_of_headers = cbmstrcasestr(rfc822, "\n\r\n");
 	if (end_of_headers == NULL) {
-		end_of_headers = bmstrcasestr(rfc822, "\n\n");
+		end_of_headers = cbmstrcasestr(rfc822, "\n\n");
 	}
 	if (end_of_headers == NULL) return (NULL);
 
-	field_start = bmstrcasestr(rfc822, fieldhdr);
+	field_start = cbmstrcasestr(rfc822, fieldhdr);
 	if (field_start == NULL) return(NULL);
 	if (field_start > end_of_headers) return(NULL);
 
@@ -832,11 +874,11 @@ char *rfc822_fetch_field(char *rfc822, char *fieldname) {
 	strcpy(fieldbuf, "");
 
 	ptr = field_start;
-	ptr = memreadline(ptr, fieldbuf, SIZ-strlen(fieldbuf) );
+	ptr = cmemreadline(ptr, fieldbuf, SIZ-strlen(fieldbuf) );
 	while ( (isspace(ptr[0])) && (ptr < end_of_headers) ) {
 		strcat(fieldbuf, " ");
 		cont = &fieldbuf[strlen(fieldbuf)];
-		ptr = memreadline(ptr, cont, SIZ-strlen(fieldbuf) );
+		ptr = cmemreadline(ptr, cont, SIZ-strlen(fieldbuf) );
 		striplt(cont);
 	}
 
@@ -867,7 +909,7 @@ void directory_key(char *key, char *addr) {
 	}
 	key[keylen++] = 0;
 
-	CtdlLogPrintf(CTDL_DEBUG, "Directory key is <%s>\n", key);
+	syslog(LOG_DEBUG, "Directory key is <%s>\n", key);
 }
 
 
@@ -907,17 +949,15 @@ void CtdlDirectoryInit(void) {
 /*
  * Add an Internet e-mail address to the directory for a user
  */
-void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
+int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
 
-	CtdlLogPrintf(CTDL_DEBUG, "Dir: %s --> %s\n",
-		internet_addr, citadel_addr);
-	if (IsDirectory(internet_addr, 0) == 0) return;
-
+	if (IsDirectory(internet_addr, 0) == 0) 
+		return 0;
+	syslog(LOG_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr);
 	directory_key(key, internet_addr);
-
-	cdb_store(CDB_DIRECTORY, key, strlen(key),
-		citadel_addr, strlen(citadel_addr)+1 );
+	cdb_store(CDB_DIRECTORY, key, strlen(key), citadel_addr, strlen(citadel_addr)+1 );
+	return 1;
 }
 
 
@@ -927,11 +967,12 @@ void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
  * (NOTE: we don't actually use or need the citadel_addr variable; it's merely
  * here because the callback API expects to be able to send it.)
  */
-void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
+int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
 
+	syslog(LOG_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr);
 	directory_key(key, internet_addr);
-	cdb_delete(CDB_DIRECTORY, key, strlen(key) );
+	return cdb_delete(CDB_DIRECTORY, key, strlen(key) ) == 0;
 }
 
 
@@ -975,20 +1016,20 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 	char user[256], node[256], name[256];
 	int is_harvestable;
 	int i, j, h;
-	int field = 0;
+	eMsgField field = 0;
 
 	if (msg == NULL) return(NULL);
 
 	is_harvestable = 1;
 	strcpy(addr, "");	
-	if (msg->cm_fields['A'] != NULL) {
-		strcat(addr, msg->cm_fields['A']);
+	if (!CM_IsEmpty(msg, eAuthor)) {
+		strcat(addr, msg->cm_fields[eAuthor]);
 	}
-	if (msg->cm_fields['F'] != NULL) {
+	if (!CM_IsEmpty(msg, erFc822Addr)) {
 		strcat(addr, " <");
-		strcat(addr, msg->cm_fields['F']);
+		strcat(addr, msg->cm_fields[erFc822Addr]);
 		strcat(addr, ">");
-		if (IsDirectory(msg->cm_fields['F'], 0)) {
+		if (IsDirectory(msg->cm_fields[erFc822Addr], 0)) {
 			is_harvestable = 0;
 		}
 	}
@@ -1004,10 +1045,10 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 
 	/* Scan both the R (To) and Y (CC) fields */
 	for (i = 0; i < 2; ++i) {
-		if (i == 0) field = 'R' ;
-		if (i == 1) field = 'Y' ;
+		if (i == 0) field = eRecipient;
+		if (i == 1) field = eCarbonCopY;
 
-		if (msg->cm_fields[field] != NULL) {
+		if (!CM_IsEmpty(msg, field)) {
 			for (j=0; j<num_tokens(msg->cm_fields[field], ','); ++j) {
 				extract_token(addr, msg->cm_fields[field], j, ',', sizeof addr);
 				if (strstr(addr, "=?") != NULL)