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 7C780431FB6 for ; Fri, 15 Apr 2011 04:28:09 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled 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 2kofIuPdfss6 for ; Fri, 15 Apr 2011 04:28:09 -0700 (PDT) Received: from mail4.ucc.ie (mail4.ucc.ie [143.239.1.34]) by olra.theworths.org (Postfix) with ESMTP id B54FA431FB5 for ; Fri, 15 Apr 2011 04:28:08 -0700 (PDT) Received: from msstf091.ucc.ie (msstf091.ucc.ie [143.239.76.91]) by mail4.ucc.ie (8.14.4/8.14.4) with ESMTP id p3FBS0Qv014913 for ; Fri, 15 Apr 2011 12:28:05 +0100 Received: by msstf091.ucc.ie (Postfix, from userid 1000) id 7182A62B3C; Fri, 15 Apr 2011 12:28:00 +0100 (IST) From: Andreas Amann To: Notmuch Mail Subject: Re: Problem with "Unexpected output" messages In-Reply-To: <87pqozi3q2.fsf@msstf091.ucc.ie> References: <87pqozi3q2.fsf@msstf091.ucc.ie> User-Agent: Notmuch/0.5-138-g91d61c7 (http://notmuchmail.org) Emacs/24.0.50.1 (x86_64-unknown-linux-gnu) Date: Fri, 15 Apr 2011 12:28:00 +0100 Message-ID: <8739ljwy7z.fsf@msstf091.ucc.ie> MIME-Version: 1.0 Content-Type: text/plain X-MD-NoSA: yes X-Scanned-By: MIMEDefang 2.68 on 143.239.1.34 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Fri, 15 Apr 2011 11:28:09 -0000 On Wed, 06 Apr 2011 20:23:17 +0100, Andreas Amann wrote: > > since commit 44d3c57e (emacs: Display any unexpected output from notmuch > search) I see a number of messages of the form > > Error: Unexpected output from notmuch search: > thread:000000000000XXXX > > after notmuch-search in emacs. FWIW, the patch below solves the problem for me. Andreas --------------------- [PATCH] Sanitize "Subject:" and "Author:" fields to not contain control characters in notmuch-search When a Subject field contained encoded CRLF sequences, these sequences would appear unfiltered in the output of notmuch search. This confused the notmuch emacs interface leading to "Unexpected Output" messages. This is now fixed by replacing all characters with ASCII code less than 32 with a question mark. --- notmuch-search.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/notmuch-search.c b/notmuch-search.c index 8b90121..fc13e60 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -108,6 +108,20 @@ format_item_id_text (unused (const void *ctx), printf ("%s%s", item_type, item_id); } +static char * +sanitize_string(const void *ctx, const char *str) +{ + char *out, *loop; + + loop = out = talloc_strdup (ctx, str); + + for(;*loop;loop++){ + if ((unsigned char)(*loop) < 32) + *loop = '?'; + } + return out; +} + static void format_thread_text (const void *ctx, const char *thread_id, @@ -117,13 +131,17 @@ format_thread_text (const void *ctx, const char *authors, const char *subject) { + void *ctx_quote = talloc_new (ctx); + printf ("thread:%s %12s [%d/%d] %s; %s", thread_id, notmuch_time_relative_date (ctx, date), matched, total, - authors, - subject); + sanitize_string(ctx_quote, authors), + sanitize_string(ctx_quote, subject)); + + talloc_free (ctx_quote); } static void -- 1.7.4.1