From 69373fbbb010047bb9e20a41654f75905480ec85 Mon Sep 17 00:00:00 2001 From: Peter Feigl Date: Fri, 30 Nov 2012 09:29:02 +0100 Subject: [PATCH] [PATCH 2/3] Use the S-Expression structured printer for notmuch search. --- d0/5fc3b47591e5242da319782d3a28503a10c0c3 | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 d0/5fc3b47591e5242da319782d3a28503a10c0c3 diff --git a/d0/5fc3b47591e5242da319782d3a28503a10c0c3 b/d0/5fc3b47591e5242da319782d3a28503a10c0c3 new file mode 100644 index 000000000..f1124851e --- /dev/null +++ b/d0/5fc3b47591e5242da319782d3a28503a10c0c3 @@ -0,0 +1,99 @@ +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 98423431FD8 + for ; Fri, 30 Nov 2012 00:35:11 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.001 +X-Spam-Level: +X-Spam-Status: No, score=0.001 tagged_above=-999 required=5 + tests=[FREEMAIL_FROM=0.001] 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 iU2SmT3k+bbB for ; + Fri, 30 Nov 2012 00:35:11 -0800 (PST) +Received: from mail.nexoid.at (www.nexoid.at [178.79.130.240]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 02721431FBC + for ; Fri, 30 Nov 2012 00:35:10 -0800 (PST) +Received: by mail.nexoid.at (Postfix, from userid 1000) + id DB22C11C0D1; Fri, 30 Nov 2012 09:29:17 +0100 (CET) +From: Peter Feigl +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] Use the S-Expression structured printer for notmuch + search. +Date: Fri, 30 Nov 2012 09:29:02 +0100 +Message-Id: <1354264143-30173-2-git-send-email-craven@gmx.net> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1354264143-30173-1-git-send-email-craven@gmx.net> +References: <1354264143-30173-1-git-send-email-craven@gmx.net> +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, 30 Nov 2012 08:35:11 -0000 + +This commit adds support for --format=sexp to notmuch search. +--- + notmuch-search.c | 6 +++++- + sprinter.h | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/notmuch-search.c b/notmuch-search.c +index 830c4e4..6218622 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -305,7 +305,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + int exclude = EXCLUDE_TRUE; + unsigned int i; + +- enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } ++ enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT, NOTMUCH_FORMAT_SEXP } + format_sel = NOTMUCH_FORMAT_TEXT; + + notmuch_opt_desc_t options[] = { +@@ -315,6 +315,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + { 0, 0 } } }, + { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', + (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, ++ { "sexp", NOTMUCH_FORMAT_SEXP }, + { "text", NOTMUCH_FORMAT_TEXT }, + { 0, 0 } } }, + { NOTMUCH_OPT_KEYWORD, &output, "output", 'o', +@@ -347,6 +348,9 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + case NOTMUCH_FORMAT_JSON: + format = sprinter_json_create (ctx, stdout); + break; ++ case NOTMUCH_FORMAT_SEXP: ++ format = sprinter_sexp_create (ctx, stdout); ++ break; + default: + /* this should never happen */ + INTERNAL_ERROR("no output format selected"); +diff --git a/sprinter.h b/sprinter.h +index 912a526..59776a9 100644 +--- a/sprinter.h ++++ b/sprinter.h +@@ -70,4 +70,8 @@ sprinter_text_create (const void *ctx, FILE *stream); + struct sprinter * + sprinter_json_create (const void *ctx, FILE *stream); + ++/* Create a new structure printer that emits S-Expressions. */ ++struct sprinter * ++sprinter_sexp_create (const void *ctx, FILE *stream); ++ + #endif // NOTMUCH_SPRINTER_H +-- +1.8.0 + -- 2.26.2