parse reply-to header into its permanent database field

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 7a9f4b07816810967e106731f4e2781ddb675c36..77e743a6bfaac8131fd4df7d2500f05000c7e159 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -389,9 +389,10 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
             pField++, sField++)
        {
                if ((*sField=='\r') || (*sField=='\n')) {
-                       while (isspace(*sField))
-                               sField++;
-                       *pField = *sField;
+                   sField++;
+                   if  (*sField == '\n')
+                       sField++;
+                   *pField = *sField;
                }
                else {
                        if (*sField=='\"') quote = 1 - quote;
@@ -680,6 +681,14 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
                processed = 1;
        }
 
+       else if (!strcasecmp(key, "Reply-To")) {
+               if (msg->cm_fields['K'] != NULL) {
+                       free(msg->cm_fields['K']);
+               }
+               msg->cm_fields['K'] = strndup(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'] = strndup(value, valuelen);
@@ -779,8 +788,7 @@ struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
                       (done == 0) ) 
                {
 
-                       if ((*pos=='\n') &&
-                           (!isspace(*(pos+1)))) 
+                       if ( (*pos=='\n') && ((*(pos+1))!=0x20) && ((*(pos+1))!=0x09) )
                        {
                                end = pos;
                        }