--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 4F809431FC0\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 14:05:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id FowfaireEszM for <notmuch@notmuchmail.org>;\r
+ Sun, 16 Dec 2012 14:05:27 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+ [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 37AB1429E34\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 14:05:27 -0800 (PST)\r
+Received: by mail-lb0-f181.google.com with SMTP id ge1so4072140lbb.26\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 14:05:25 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :in-reply-to:references:x-gm-message-state;\r
+ bh=h+5ItNnYKblODbKUDb/r/dljMhbz3lBRx6ePs+998jY=;\r
+ b=aaeoIjp6e9qwq6Y7NqSel9xIRLILnofEEq5/qrpuyigDc8x2FnoVZ4v2wrWWNxjDEh\r
+ L5pFruAfKHctt3CyWFZb4y5AddksoHXgiulgX1i5Q74LPvcUPf2x4OeZ0fpLD70rHF1A\r
+ PZtnHD/1qtJiJ+P5aDu4rTwk0DLzqhZJ37ofh0HRpmwbaXW+jCKqTcyOsC3NMhzhY5gE\r
+ ZyldDBsT6o3VwpNG6Y0AST+Mpw/ekJ4G2k4IStujSo87nRXTsoUxGKjVTXC8Elz4TP2Y\r
+ rmjQT2h9G8bCy6lYI069UkKTu4Owb+SDUOl/55MCX4WlYgMbHHLXc9NS3eZ+w6dzfsKA\r
+ 6Iyw==\r
+Received: by 10.152.124.111 with SMTP id mh15mr8860466lab.20.1355695525542;\r
+ Sun, 16 Dec 2012 14:05:25 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+ [80.223.81.27])\r
+ by mx.google.com with ESMTPS id sj3sm4118153lab.2.2012.12.16.14.05.23\r
+ (version=SSLv3 cipher=OTHER); Sun, 16 Dec 2012 14:05:24 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 3/5] cli: add --format=text0 to notmuch search\r
+Date: Mon, 17 Dec 2012 00:05:11 +0200\r
+Message-Id:\r
+ <ac2e9d6223e58349afd798828a8ad433528af5cf.1355695036.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1355695036.git.jani@nikula.org>\r
+References: <cover.1355695036.git.jani@nikula.org>\r
+In-Reply-To: <cover.1355695036.git.jani@nikula.org>\r
+References: <cover.1355695036.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQno4Qdn5eWkkQXuQKOn5sztPnwXuxK93yNhpX/D5m68IacpIyr+BWlF8XY4ZbQpRC56y9ly\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 16 Dec 2012 22:05:29 -0000\r
+\r
+Add new format text0, which is otherwise the same as text, but use the\r
+null character as separator instead of the newline character. This is\r
+similar to find(1) -print0 option, and works together with the\r
+xargs(1) -0 option.\r
+---\r
+ notmuch-search.c | 16 ++++++++++++++--\r
+ 1 file changed, 14 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 7704915..0b0a879 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -305,8 +305,12 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ int exclude = EXCLUDE_TRUE;\r
+ unsigned int i;\r
+ \r
+- enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT, NOTMUCH_FORMAT_SEXP }\r
+- format_sel = NOTMUCH_FORMAT_TEXT;\r
++ enum {\r
++ NOTMUCH_FORMAT_JSON,\r
++ NOTMUCH_FORMAT_TEXT,\r
++ NOTMUCH_FORMAT_TEXT0,\r
++ NOTMUCH_FORMAT_SEXP\r
++ } format_sel = NOTMUCH_FORMAT_TEXT;\r
+ \r
+ notmuch_opt_desc_t options[] = {\r
+ { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',\r
+@@ -317,6 +321,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },\r
+ { "sexp", NOTMUCH_FORMAT_SEXP },\r
+ { "text", NOTMUCH_FORMAT_TEXT },\r
++ { "text0", NOTMUCH_FORMAT_TEXT0 },\r
+ { 0, 0 } } },\r
+ { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 },\r
+ { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',\r
+@@ -346,6 +351,13 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ case NOTMUCH_FORMAT_TEXT:\r
+ format = sprinter_text_create (ctx, stdout);\r
+ break;\r
++ case NOTMUCH_FORMAT_TEXT0:\r
++ if (output == OUTPUT_SUMMARY) {\r
++ fprintf (stderr, "Error: --format=text0 is not compatible with --output=summary.\n");\r
++ return 1;\r
++ }\r
++ format = sprinter_text0_create (ctx, stdout);\r
++ break;\r
+ case NOTMUCH_FORMAT_JSON:\r
+ format = sprinter_json_create (ctx, stdout);\r
+ break;\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff