Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id D8CA8431FBC for ; Wed, 18 Nov 2009 11:56:24 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aRx-6oOVOCf5 for ; Wed, 18 Nov 2009 11:56:23 -0800 (PST) Received: from keithp.com (home.keithp.com [63.227.221.253]) by olra.theworths.org (Postfix) with ESMTP id 12328431FAE for ; Wed, 18 Nov 2009 11:56:23 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 150DEB9404C for ; Wed, 18 Nov 2009 11:56:21 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id wCZMnIzscRaV; Wed, 18 Nov 2009 11:56:15 -0800 (PST) Received: by keithp.com (Postfix, from userid 1033) id 47B3DB9402F; Wed, 18 Nov 2009 11:56:15 -0800 (PST) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 3B1A1B88003; Wed, 18 Nov 2009 11:56:15 -0800 (PST) Received: by koto.keithp.com (Postfix, from userid 1488) id CE9901581A5; Wed, 18 Nov 2009 11:56:14 -0800 (PST) From: Keith Packard To: notmuch@notmuchmail.org Date: Wed, 18 Nov 2009 11:56:13 -0800 Message-Id: <1258574173-19911-1-git-send-email-keithp@keithp.com> X-Mailer: git-send-email 1.6.5.2 Subject: [notmuch] [PATCH] Filter out carriage-returns in show and reply output. X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 19:56:25 -0000 Thanks, windows mail clients. Signed-off-by: Keith Packard --- 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