cli: add options --offset and --limit to notmuch search

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index dbb1efb97f5954438d6d274f8bc5b7fb9cfb68c9..603992a612448c8892888580a4fae68f5aa123dc 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -708,6 +708,9 @@ format_part_end_json (GMimeObject *part)
 static void
 format_part_content_raw (GMimeObject *part)
 {
+    if (! GMIME_IS_PART (part))
+       return;
+
     GMimeStream *stream_stdout;
     GMimeStream *stream_filter = NULL;
     GMimeDataWrapper *wrapper;
@@ -933,6 +936,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     params.cryptoctx = NULL;
     params.decrypt = 0;
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
            i++;