int i;
const char *colonpos = NULL;
int processed = 0;
- char buf[SIZ];
char user[1024];
char node[1024];
char name[1024];
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[eTimestamp] == NULL)
- msg->cm_fields[eTimestamp] = 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);
syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
- snprintf(addr, sizeof addr, "%s@%s", user, node);
- if (msg->cm_fields[eAuthor] == NULL)
- msg->cm_fields[eAuthor] = strdup(name);
- if (msg->cm_fields[erFc822Addr] == NULL)
- msg->cm_fields[erFc822Addr] = strdup(addr);
+ 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[eMsgSubject] == NULL)
- msg->cm_fields[eMsgSubject] = strndup(value, valuelen);
+ if (CM_IsEmpty(msg, eMsgSubject))
+ CM_SetField(msg, eMsgSubject, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "List-ID")) {
- if (msg->cm_fields[eListID] == NULL)
- msg->cm_fields[eListID] = strndup(value, valuelen);
+ if (CM_IsEmpty(msg, eListID))
+ CM_SetField(msg, eListID, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "To")) {
- if (msg->cm_fields[eRecipient] == NULL)
- msg->cm_fields[eRecipient] = strndup(value, valuelen);
+ if (CM_IsEmpty(msg, eRecipient))
+ CM_SetField(msg, eRecipient, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "CC")) {
- if (msg->cm_fields[eCarbonCopY] == NULL)
- msg->cm_fields[eCarbonCopY] = strndup(value, valuelen);
+ if (CM_IsEmpty(msg, eCarbonCopY))
+ CM_SetField(msg, eCarbonCopY, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "Message-ID")) {
- if (msg->cm_fields[emessageId] != NULL) {
+ if (!CM_IsEmpty(msg, emessageId)) {
syslog(LOG_WARNING, "duplicate message id\n");
}
+ else {
+ char *pValue;
+ long pValueLen;
- if (msg->cm_fields[emessageId] == NULL) {
- msg->cm_fields[emessageId] = strndup(value, valuelen);
-
+ pValue = value;
+ pValueLen = valuelen;
/* Strip angle brackets */
- while (haschar(msg->cm_fields[emessageId], '<') > 0) {
- strcpy(&msg->cm_fields[emessageId][0],
- &msg->cm_fields[emessageId][1]);
+ while (haschar(pValue, '<') > 0) {
+ pValue ++;
+ pValueLen --;
}
- for (i = 0; i<strlen(msg->cm_fields[emessageId]); ++i)
- if (msg->cm_fields[emessageId][i] == '>')
- msg->cm_fields[emessageId][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[eMessagePath] == NULL)
- msg->cm_fields[eMessagePath] = strndup(value, valuelen);
+ if (CM_IsEmpty(msg, eMessagePath))
+ CM_SetField(msg, eMessagePath, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "Envelope-To")) {
- if (msg->cm_fields[eenVelopeTo] == NULL)
- msg->cm_fields[eenVelopeTo] = strndup(value, valuelen);
+ if (CM_IsEmpty(msg, eenVelopeTo))
+ CM_SetField(msg, eenVelopeTo, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "References")) {
- if (msg->cm_fields[eWeferences] != NULL) {
- free(msg->cm_fields[eWeferences]);
- }
- msg->cm_fields[eWeferences] = strndup(value, valuelen);
+ CM_SetField(msg, eWeferences, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "Reply-To")) {
- if (msg->cm_fields[eReplyTo] != NULL) {
- free(msg->cm_fields[eReplyTo]);
- }
- msg->cm_fields[eReplyTo] = strndup(value, valuelen);
+ CM_SetField(msg, eReplyTo, value, valuelen);
processed = 1;
}
else if (!strcasecmp(key, "In-reply-to")) {
- if (msg->cm_fields[eWeferences] == NULL) { /* References: supersedes In-reply-to: */
- msg->cm_fields[eWeferences] = strndup(value, valuelen);
- }
+ if (CM_IsEmpty(msg, eWeferences)) /* References: supersedes In-reply-to: */
+ CM_SetField(msg, eWeferences, value, valuelen);
processed = 1;
}
/* Clean up and move on. */
free(key); /* Don't free 'value', it's actually the same buffer */
- return(processed);
+ return processed;
}
/*
* Convert an RFC822 message (headers + body) to a CtdlMessage structure.
* NOTE: the supplied buffer becomes part of the CtdlMessage structure, and
- * will be deallocated when CtdlFreeMessage() is called. Therefore, the
+ * will be deallocated when CM_Free() is called. Therefore, the
* supplied buffer should be DEREFERENCED. It should not be freed or used
* again.
*/
struct CtdlMessage *msg;
const char *pos, *beg, *end, *totalend;
int done, alldone = 0;
- char buf[SIZ];
int converted;
StrBuf *OtherHeaders;
if (pos < totalend)
StrBufAppendBufPlain(OtherHeaders, pos, totalend - pos, 0);
FreeStrBuf(rfc822);
- msg->cm_fields[eMesageText] = SmashStrBuf(&OtherHeaders);
+ 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[eTimestamp] == NULL) {
- snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
- msg->cm_fields[eTimestamp] = 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[eWeferences] != NULL) {
+ if (!CM_IsEmpty(msg, eWeferences)) {
+ /// todo: API!
convert_references_to_wefewences(msg->cm_fields[eWeferences]);
}
is_harvestable = 1;
strcpy(addr, "");
- if (msg->cm_fields[eAuthor] != NULL) {
+ if (!CM_IsEmpty(msg, eAuthor)) {
strcat(addr, msg->cm_fields[eAuthor]);
}
- if (msg->cm_fields[erFc822Addr] != NULL) {
+ if (!CM_IsEmpty(msg, erFc822Addr)) {
strcat(addr, " <");
strcat(addr, msg->cm_fields[erFc822Addr]);
strcat(addr, ">");
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)
projects / citadel.git / blobdiff