From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 1D8DB431FD7 for ; Sat, 10 Mar 2012 03:05:46 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.201 X-Spam-Level: X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 u0wU1xfo7pZ4 for ; Sat, 10 Mar 2012 03:05:44 -0800 (PST) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 81BBA431FC3 for ; Sat, 10 Mar 2012 03:05:44 -0800 (PST) Received: by mail-wi0-f173.google.com with SMTP id hq7so1254475wib.2 for ; Sat, 10 Mar 2012 03:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FhgNL4/V/BFx/Md6F0MTKs47nXWsS7Cqog/jtk6bWEE=; b=ZY+ueJXLc5wnRjWp0od3f/b4iM1CyiO1MkLX6oqcWys+g1JqkUDhJIOd9bFQuIZ536 eK2D3pr8aKrMe8lCtj+qmC6w2t+kAxY3v24tXRK4y+l/ehNF7JT5svYhsi3e3c4o470q jzF4qeNxe7mdUh2k8xZRdSj+YjSYb0Y0DmrgY1GA5yK6Z7L9+ACKcxdga5+SoHJkny3h WbMjQTI1iFoyAUGY0fVhuPTLwsb+tKBaVaicA9SvozGfrGbWrQDn7b/rpMnlYmeLP6G/ xyj5Pj9STsbMWzyPm1ZcB8sJpG82Ln7JlrfDZJq1wKeBh3dhjJWzYskFHZtGR3NphgbR GH9w== Received: by 10.216.136.202 with SMTP id w52mr3372097wei.109.1331377544116; Sat, 10 Mar 2012 03:05:44 -0800 (PST) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id ep17sm13375140wid.2.2012.03.10.03.05.42 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 10 Mar 2012 03:05:43 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH 2/2] cli: make --entire-thread=false work for format=json. Date: Sat, 10 Mar 2012 11:05:33 +0000 Message-Id: <1331377533-30262-3-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331377533-30262-1-git-send-email-markwalters1009@gmail.com> References: <1331377533-30262-1-git-send-email-markwalters1009@gmail.com> 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: Sat, 10 Mar 2012 11:05:46 -0000 The --entire-thread option in notmuch-show.c defaults to true when format=json. Previously there was no way to turn this off. This patch makes it respect --entire-thread=false. The one subtlety is that we initialise a notmuch_bool_t to -1 to indicate that the option parsing has not set it. This allows the code to distinguish between the option being omitted from the command line, and the option being set to false on the command line. --- notmuch-show.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 05d51b2..8da1845 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -983,7 +983,12 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) char *query_string; int opt_index, ret; const notmuch_show_format_t *format = &format_text; - notmuch_show_params_t params = { .part = -1 }; + + /* We abuse the notmuch_bool_t variable params.entire-thread by + * setting it to -1 to denote that the command line parsing has + * not set it. We ensure it is set to TRUE or FALSE before passing + * it to any other function.*/ + notmuch_show_params_t params = { .part = -1, .entire_thread = -1 }; int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; notmuch_bool_t verify = FALSE; notmuch_bool_t no_exclude = FALSE; @@ -1020,7 +1025,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) switch (format_sel) { case NOTMUCH_FORMAT_JSON: format = &format_json; - params.entire_thread = TRUE; + /* JSON defaults to entire-thread TRUE */ + if (params.entire_thread == -1) + params.entire_thread = TRUE; break; case NOTMUCH_FORMAT_TEXT: format = &format_text; @@ -1042,6 +1049,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) params.raw = TRUE; break; } + /* Default is entire-thread = FALSE except for format=json which + * is dealt with above. */ + if (params.entire_thread == -1) + params.entire_thread = FALSE; if (params.decrypt || verify) { #ifdef GMIME_ATLEAST_26 -- 1.7.9.1