aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2000-05-23 11:26:36 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-05-23 11:26:36 +0800
commit117f3abbfbcffc3a1f7a70f313b83f4892c215ac (patch)
treebfdc1329caf9f07e9ed5e71bd4aaf61b4f679a7e /camel
parentff54ebc1ae1bb12ced982fcecfb98eb0a012912a (diff)
downloadgsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.tar
gsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.tar.gz
gsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.tar.bz2
gsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.tar.lz
gsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.tar.xz
gsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.tar.zst
gsoc2013-evolution-117f3abbfbcffc3a1f7a70f313b83f4892c215ac.zip
more stuff
svn path=/trunk/; revision=3170
Diffstat (limited to 'camel')
-rw-r--r--camel/camel-mime-filter-smtp.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/camel/camel-mime-filter-smtp.c b/camel/camel-mime-filter-smtp.c
index 5bfeea5ff4..79986fe959 100644
--- a/camel/camel-mime-filter-smtp.c
+++ b/camel/camel-mime-filter-smtp.c
@@ -108,13 +108,16 @@ filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, s
;
if (c == '\n' || !midline) {
- linecount++;
- node = alloca(sizeof(*node));
- node->type = EOLN_NODE;
- node->pointer = inptr - 1;
- node->next = NULL;
- tail->next = node;
- tail = node;
+ /* if there isn't already a carriage-return before the line-feed, count it */
+ if (*(inptr-1) != '\r') {
+ linecount++;
+ node = alloca(sizeof(*node));
+ node->type = EOLN_NODE;
+ node->pointer = inptr - 1;
+ node->next = NULL;
+ tail->next = node;
+ tail = node;
+ }
left = inend - inptr;
if (left > 0) {