From bdc260ae28301da1d022ead53555fb9369ce04e7 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 23 May 2011 00:35:37 -0700 Subject: [PATCH 1/1] throw error if mbox format specified with --part These formats are incompatible, since mbox format requires full messages. --- notmuch-show.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/notmuch-show.c b/notmuch-show.c index e128be54..c57f7bd0 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -709,6 +709,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) char *opt; const notmuch_show_format_t *format = &format_text; notmuch_show_params_t params; + int mbox = 0; int i; params.entire_thread = 0; @@ -729,6 +730,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) params.entire_thread = 1; } else if (strcmp (opt, "mbox") == 0) { format = &format_mbox; + mbox = 1; } else if (strcmp (opt, "raw") == 0) { format = &format_raw; params.raw = 1; @@ -759,6 +761,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) 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; -- 2.43.0