1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
diff -u -r1.2.8.1 camel-mime-filter-canon.c
--- camel/camel-mime-filter-canon.c 21 Jan 2003 03:07:05 -0000 1.2.8.1
+++ camel/camel-mime-filter-canon.c 26 Feb 2003 23:12:09 -0000
@@ -26,6 +26,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -170,7 +171,7 @@
if (len)
filter(f, in, len, prespace, out, outlen, outprespace);
- /* the data didn't contain an eol or was too short for "From ", we only need to check for "From" and add an eol */
+ /* the data didn't contain an eol or was too short for "From ", we only need to check for "From" */
if (f->backlen) {
inptr = (unsigned char *)f->backbuf;
inend = (unsigned char *)f->backbuf + f->backlen;
@@ -195,20 +196,7 @@
while (o>starto && (o[-1] == ' ' || o[-1] == '\t' || o[-1]=='\r'))
o--;
}
- /* check end of line canonicalisation */
- if (o>starto) {
- if (flags & CAMEL_MIME_FILTER_CANON_CRLF) {
- if (o[-1] != '\r')
- *o++ = '\r';
- } else {
- if (o[-1] == '\r')
- o--;
- }
- }
-
- /* and always finish with an eol */
- *o++ = '\n';
-
+
*outlen = o - *out;
f->backlen = 0;
diff -u -r1.24 camel-stream-filter.c
--- camel/camel-stream-filter.c 19 Jul 2002 11:25:02 -0000 1.24
+++ camel/camel-stream-filter.c 26 Feb 2003 23:12:10 -0000
@@ -19,11 +19,16 @@
* Boston, MA 02111-1307, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
#include <string.h>
#include "camel-stream-filter.h"
#define d(x)
-/*#include <stdio.h>*/
/* use my malloc debugger? */
/*extern void g_check(void *mp);*/
@@ -368,10 +373,18 @@
{
CamelStreamFilter *filter = (CamelStreamFilter *)stream;
struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
+ struct _filter *f;
+
if (p->filteredlen > 0)
return FALSE;
-
+
+ f = p->filters;
+ while (f) {
+ if (f->filter->backlen > 0)
+ return FALSE;
+ f = f->next;
+ }
+
return camel_stream_eos(filter->source);
}
|
