From 35679ea0a87c4b9882435384b4e1b72d72442cea Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 6 Feb 2012 21:57:22 +0200 Subject: [PATCH] [PATCH v2 2/3] cli: convert "notmuch show" to use the new argument parser --- 3c/2f49b6d41e8e430036c5e436bbd8a4ffbe2b08 | 274 ++++++++++++++++++++++ 1 file changed, 274 insertions(+) create mode 100644 3c/2f49b6d41e8e430036c5e436bbd8a4ffbe2b08 diff --git a/3c/2f49b6d41e8e430036c5e436bbd8a4ffbe2b08 b/3c/2f49b6d41e8e430036c5e436bbd8a4ffbe2b08 new file mode 100644 index 000000000..89d83c33f --- /dev/null +++ b/3c/2f49b6d41e8e430036c5e436bbd8a4ffbe2b08 @@ -0,0 +1,274 @@ +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 BEFDF431FC0 + for ; Mon, 6 Feb 2012 11:57:37 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 awDBEhbsRrxt for ; + Mon, 6 Feb 2012 11:57:35 -0800 (PST) +Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com + [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D2F40431FAE + for ; Mon, 6 Feb 2012 11:57:34 -0800 (PST) +Received: by mail-lpp01m010-f53.google.com with SMTP id d3so3838995lah.26 + for ; Mon, 06 Feb 2012 11:57:34 -0800 (PST) +Received: by 10.152.127.136 with SMTP id ng8mr4729206lab.16.1328558254428; + Mon, 06 Feb 2012 11:57:34 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. + [84.248.80.253]) + by mx.google.com with ESMTPS id s6sm13776662lbl.12.2012.02.06.11.57.32 + (version=SSLv3 cipher=OTHER); Mon, 06 Feb 2012 11:57:33 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/3] cli: convert "notmuch show" to use the new argument + parser +Date: Mon, 6 Feb 2012 21:57:22 +0200 +Message-Id: + <54304bc7a019bfdb474ab04fbad75e48ad1fc699.1328558175.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: +References: + + +In-Reply-To: +References: +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: Mon, 06 Feb 2012 19:57:38 -0000 + +Use the new notmuch argument parser to handle arguments in "notmuch +show". There are three minor functional changes: + +1) Also set params.raw = TRUE when defaulting to raw format when part + is requested but format is not specified. This was a bug, and + --part=0 without --format=raw did not work previously. + +2) Set params.decrypt = FALSE if crypto context creation fails. + +3) Only use the parameters for the last --format if specified multiple + times. Previously this could have resulted in a non-working mixture + of parameters. + +Signed-off-by: Jani Nikula +--- + notmuch-show.c | 149 ++++++++++++++++++++++++++++---------------------------- + 1 files changed, 75 insertions(+), 74 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index e04b3cc..b358278 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1049,6 +1049,14 @@ do_show (void *ctx, + return 0; + } + ++enum { ++ NOTMUCH_FORMAT_NOT_SPECIFIED, ++ NOTMUCH_FORMAT_JSON, ++ NOTMUCH_FORMAT_TEXT, ++ NOTMUCH_FORMAT_MBOX, ++ NOTMUCH_FORMAT_RAW ++}; ++ + int + notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + { +@@ -1056,92 +1064,94 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + notmuch_database_t *notmuch; + notmuch_query_t *query; + char *query_string; +- char *opt; ++ int opt_index; + const notmuch_show_format_t *format = &format_text; +- notmuch_show_params_t params; +- int mbox = 0; +- int format_specified = 0; +- int i; ++ notmuch_show_params_t params = { .part = -1 }; ++ int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; ++ notmuch_bool_t verify = FALSE; ++ ++ notmuch_opt_desc_t options[] = { ++ { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', ++ (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, ++ { "text", NOTMUCH_FORMAT_TEXT }, ++ { "mbox", NOTMUCH_FORMAT_MBOX }, ++ { "raw", NOTMUCH_FORMAT_RAW }, ++ { 0, 0 } } }, ++ { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, ¶ms.entire_thread, "entire-thread", 't', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 }, ++ { 0, 0, 0, 0, 0 } ++ }; + +- params.entire_thread = FALSE; +- params.raw = FALSE; +- params.part = -1; +- params.cryptoctx = NULL; +- params.decrypt = FALSE; ++ opt_index = parse_arguments (argc, argv, options, 1); ++ if (opt_index < 0) { ++ /* diagnostics already printed */ ++ return 1; ++ } + +- argc--; argv++; /* skip subcommand argument */ ++ if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) { ++ /* if part was requested and format was not specified, use format=raw */ ++ if (params.part >= 0) ++ format_sel = NOTMUCH_FORMAT_RAW; ++ else ++ format_sel = NOTMUCH_FORMAT_TEXT; ++ } + +- for (i = 0; i < argc && argv[i][0] == '-'; i++) { +- if (strcmp (argv[i], "--") == 0) { +- i++; +- break; ++ switch (format_sel) { ++ case NOTMUCH_FORMAT_JSON: ++ format = &format_json; ++ params.entire_thread = TRUE; ++ break; ++ case NOTMUCH_FORMAT_TEXT: ++ format = &format_text; ++ break; ++ case NOTMUCH_FORMAT_MBOX: ++ if (params.part > 0) { ++ fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); ++ return 1; + } +- if (STRNCMP_LITERAL (argv[i], "--format=") == 0) { +- opt = argv[i] + sizeof ("--format=") - 1; +- if (strcmp (opt, "text") == 0) { +- format = &format_text; +- } else if (strcmp (opt, "json") == 0) { +- format = &format_json; +- params.entire_thread = TRUE; +- } else if (strcmp (opt, "mbox") == 0) { +- format = &format_mbox; +- mbox = 1; +- } else if (strcmp (opt, "raw") == 0) { +- format = &format_raw; +- params.raw = TRUE; +- } else { +- fprintf (stderr, "Invalid value for --format: %s\n", opt); +- return 1; +- } +- format_specified = 1; +- } else if (STRNCMP_LITERAL (argv[i], "--part=") == 0) { +- params.part = atoi(argv[i] + sizeof ("--part=") - 1); +- } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { +- params.entire_thread = TRUE; +- } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) || +- (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { +- if (params.cryptoctx == NULL) { ++ format = &format_mbox; ++ break; ++ case NOTMUCH_FORMAT_RAW: ++ format = &format_raw; ++ /* If --format=raw specified without specifying part, we can only ++ * output single message, so set part=0 */ ++ if (params.part < 0) ++ params.part = 0; ++ params.raw = TRUE; ++ break; ++ } ++ ++ if (params.decrypt || verify) { + #ifdef GMIME_ATLEAST_26 +- /* TODO: GMimePasswordRequestFunc */ +- if (NULL == (params.cryptoctx = g_mime_gpg_context_new(NULL, "gpg"))) ++ /* TODO: GMimePasswordRequestFunc */ ++ params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg"); + #else +- GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL); +- if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg"))) ++ GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL); ++ params.cryptoctx = g_mime_gpg_context_new (session, "gpg"); + #endif +- fprintf (stderr, "Failed to construct gpg context.\n"); +- else +- g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE); +-#ifndef GMIME_ATLEAST_26 +- g_object_unref (session); +- session = NULL; +-#endif +- } +- if (STRNCMP_LITERAL (argv[i], "--decrypt") == 0) +- params.decrypt = TRUE; ++ if (params.cryptoctx) { ++ g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE); + } else { +- fprintf (stderr, "Unrecognized option: %s\n", argv[i]); +- return 1; ++ params.decrypt = FALSE; ++ fprintf (stderr, "Failed to construct gpg context.\n"); + } ++#ifndef GMIME_ATLEAST_26 ++ g_object_unref (session); ++#endif + } + +- argc -= i; +- argv += i; +- + config = notmuch_config_open (ctx, NULL, NULL); + if (config == NULL) + return 1; + +- query_string = query_string_from_args (ctx, argc, argv); ++ query_string = query_string_from_args (ctx, argc-opt_index, argv+opt_index); + if (query_string == NULL) { + fprintf (stderr, "Out of memory\n"); + return 1; + } + +- if (mbox && params.part > 0) { +- fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); +- return 1; +- } +- + if (*query_string == '\0') { + fprintf (stderr, "Error: notmuch show requires at least one search term.\n"); + return 1; +@@ -1158,15 +1168,6 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + return 1; + } + +- /* if part was requested and format was not specified, use format=raw */ +- if (params.part >= 0 && !format_specified) +- format = &format_raw; +- +- /* If --format=raw specified without specifying part, we can only +- * output single message, so set part=0 */ +- if (params.raw && params.part < 0) +- params.part = 0; +- + if (params.part >= 0) + return do_show_single (ctx, query, format, ¶ms); + else +-- +1.7.5.4 + -- 2.26.2