0.9.8claws5

        fix unfolding/newline stripping for multiline fields
        in generic_get_one_field()

diff --git a/src/procheader.c b/src/procheader.c
index b80f10e49d741d25e3cca59884a7119f73804527..151496470a4feb3d5467bfc70814bf16d64f4310 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -139,33 +139,31 @@ static gint generic_get_one_field(gchar *buf, gint len, void *data,
                if (buf[0] == '\r' || buf[0] == '\n') return -1;
        }
 
                if (buf[0] == '\r' || buf[0] == '\n') return -1;
        }
 

-       /* remove trailing new line */
-       strretchomp(buf);
-
-#define UNFOLD_LINE() \
-       (!hentry || (hp && hp->unfold))
-

        /* unfold line */
        while (1) {
                nexthead = peekchar(data);
                /* ([*WSP CRLF] 1*WSP) */
                if (nexthead == ' ' || nexthead == '\t') {
        /* unfold line */
        while (1) {
                nexthead = peekchar(data);
                /* ([*WSP CRLF] 1*WSP) */
                if (nexthead == ' ' || nexthead == '\t') {

-                       size_t buflen = strlen(buf);
+                       size_t buflen;
+                       /* trim previous trailing \n if requesting one header or
+                        * unfolding was requested */
+                       if (!hentry || (hp && hp->unfold))
+                               strretchomp(buf);
+
+                       buflen = strlen(buf);

                        
                        /* concatenate next line */
                        if ((len - buflen) > 2) {
                                if (getline(buf + buflen, len - buflen, data) == NULL)
                                        break;
                        
                        /* concatenate next line */
                        if ((len - buflen) > 2) {
                                if (getline(buf + buflen, len - buflen, data) == NULL)
                                        break;

-                               /* trim trailing \n if requesting one header or
-                                * unfolding was requested */
-                               if (UNFOLD_LINE())                               
-                                   strretchomp(buf);

                        } else
                                break;
                        } else
                                break;

-               } else
+               } else {
+                       /* remove trailing new line */
+                       strretchomp(buf);

                        break;
                        break;

+               }

        }
        }

-#undef UNFOLD_LINE     

 
        return hnum;
 }
 
        return hnum;
 }