[PATCH] Filter out carriage-returns in show and reply output.

classic Classic list List threaded Threaded
2 messages Options
Keith Packard Keith Packard
Reply | Threaded
Open this post in threaded view
|

[PATCH] Filter out carriage-returns in show and reply output.

Thanks, windows mail clients.

Signed-off-by: Keith Packard <[hidden email]>
---
 gmime-filter-reply.c |    7 ++++---
 notmuch-show.c       |   21 +++++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c
index 3e298e1..b269db4 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;
diff --git a/notmuch-show.c b/notmuch-show.c
index 7749dbc..4c377e1 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -99,14 +99,23 @@ show_part (GMimeObject *part, int *part_count)
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
  !g_mime_content_type_is_type (content_type, "text", "html"))
     {
- GMimeStream *stream = g_mime_stream_file_new (stdout);
- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
+ GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
+ GMimeStream *stream_filter = NULL;
+
+ if (stream_stdout) {
+    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+    stream_filter = g_mime_stream_filter_new(stream_stdout);
+    g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+     g_mime_filter_crlf_new(FALSE, FALSE));
+ }
 
  wrapper = g_mime_part_get_content_object (GMIME_PART (part));
- if (wrapper && stream)
-    g_mime_data_wrapper_write_to_stream (wrapper, stream);
- if (stream)
-    g_object_unref(stream);
+ if (wrapper && stream_filter)
+    g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+ if (stream_filter)
+    g_object_unref(stream_filter);
+ if (stream_stdout)
+    g_object_unref(stream_stdout);
     }
     else
     {
--
1.6.5.2


Carl Worth-2 Carl Worth-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Filter out carriage-returns in show and reply output.

On Wed, 18 Nov 2009 11:56:13 -0800, Keith Packard <[hidden email]> wrote:
> Thanks, windows mail clients.

Very nice to have. Pushed.

-Carl