aboutsummaryrefslogtreecommitdiffhomepage
path: root/gmime-filter-reply.c
diff options
context:
space:
mode:
authorGravatar Keith Packard <keithp@keithp.com>2009-11-18 11:55:18 -0800
committerGravatar Carl Worth <cworth@cworth.org>2009-11-18 23:34:43 +0100
commit469d786c2548b0bcd711e79726c488094ffde583 (patch)
treef0136d50695dcf09ca75784f2c83155afc1c6c6a /gmime-filter-reply.c
parent1a75f88d8b98b635db5c67aa1bbf02a02a69271a (diff)
Filter out carriage-returns in show and reply output.
Thanks, windows mail clients. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'gmime-filter-reply.c')
-rw-r--r--gmime-filter-reply.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c
index 3e298e1b..b269db4e 100644
--- a/gmime-filter-reply.c
+++ b/gmime-filter-reply.c
@@ -130,8 +130,9 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
reply->saw_nl = TRUE;
else
reply->saw_nl = FALSE;
-
- *outptr++ = *inptr++;
+ if (*inptr != '\r')
+ *outptr++ = *inptr;
+ inptr++;
}
} else {
g_mime_filter_set_size (filter, inlen + 1, FALSE);
@@ -150,7 +151,7 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
else
*outptr++ = *inptr;
reply->saw_angle = FALSE;
- } else {
+ } else if (*inptr != '\r') {
if (*inptr == '\n')
reply->saw_nl = TRUE;
*outptr++ = *inptr;