2007-01-12 [paul] 2.7.0cvs13

	* src/procmime.c
		fix Forwarding msgs with attachments
		that have dos line endings
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index dfe01b00ff556eb0c9a541b3055f5cbbc35a7d3d..b617db710aea7c9a1381e3a6aaafbbd10788e9a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-12 [paul]      2.7.0cvs13
+
+       * src/procmime.c
+               fix Forwarding msgs with attachments
+               that have dos line endings
+               Thanks to Colin
+
 2007-01-12 [wwp]       2.7.0cvs12
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index b81e79f396494ed2372e08b3949989dcebbfa518..5df054d57228e4a550b08e8f31474765775899c1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2239,3 +2239,4 @@
 ( cvs diff -u -r 1.179.2.147 -r 1.179.2.148 src/imap.c;  ) > 2.7.0cvs10.patchset
 ( cvs diff -u -r 1.105.2.77 -r 1.105.2.78 src/prefs_account.c;  ) > 2.7.0cvs11.patchset
 ( cvs diff -u -r 1.654.2.2292 -r 1.654.2.2293 configure.ac;  ) > 2.7.0cvs12.patchset
+( cvs diff -u -r 1.49.2.85 -r 1.49.2.86 src/procmime.c;  ) > 2.7.0cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 2f17ea736ba5dbd099bae224b5716dc50c85980b..ebc51831a37b6f9c0843384baba18cd4df12c74b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmime.c b/src/procmime.c
index 6d3939d950cfe5178bc097367a034b69aea66eb2..2197972cb978651a20479685b5aa2ea03745c0ba 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -2114,6 +2114,7 @@ gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
                }
                fseek(infp, mimeinfo->offset, SEEK_SET);
                while (fgets(buf, sizeof(buf), infp) == buf) {
+                       strcrchomp(buf);
                        if (buf[0] == '\n' && buf[1] == '\0')
                                break;
                        if (skip && (buf[0] == ' ' || buf[0] == '\t'))