[PATCH 6/6] notmuch-restore: check for extra arguments.

diff --git a/56/7d862f38ea35719693fb5d4f36107fdc0b6656 b/56/7d862f38ea35719693fb5d4f36107fdc0b6656
new file mode 100644 (file)
index 0000000..655ba62
--- /dev/null
+++ b/56/7d862f38ea35719693fb5d4f36107fdc0b6656
@@ -0,0 +1,93 @@
+Return-Path: <bremner@pivot.cs.unb.ca>\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 C9956431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 12:48:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 v8icIaW+a5nd for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Oct 2011 12:48:12 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5CB74429E27\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 12:48:11 -0700 (PDT)\r
+Received: from convex-new.cs.unb.ca ([131.202.13.154])\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LJm40i002205;\r
+       Fri, 21 Oct 2011 16:48:07 -0300\r
+Received: from bremner by convex-new.cs.unb.ca with local (Exim 4.72)\r
+       (envelope-from <bremner@pivot.cs.unb.ca>)\r
+       id 1RHL4W-00016c-TN; Fri, 21 Oct 2011 16:48:04 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 6/6] notmuch-restore: check for extra arguments.\r
+Date: Fri, 21 Oct 2011 16:47:57 -0300\r
+Message-Id: <1319226477-4181-7-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1319226477-4181-1-git-send-email-david@tethera.net>\r
+References: <1317317857-29636-1-git-send-email-thomas@schwinge.name>\r
+       <1319226477-4181-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\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: Fri, 21 Oct 2011 19:48:13 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+We consider it an error to pass more than one file to restore, since\r
+extra ones are ignored.\r
+---\r
+ notmuch-restore.c |    7 +++++++\r
+ test/dump-restore |    1 -\r
+ 2 files changed, 7 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+index 097ca4b..c388c23 100644\r
+--- a/notmuch-restore.c\r
++++ b/notmuch-restore.c\r
+@@ -76,6 +76,13 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])\r
+       optind++;\r
+     }\r
+ \r
++    if (optind < argc) {\r
++      fprintf (stderr,\r
++       "Cannot read dump from more than one file: %s\n",\r
++               argv[optind]);\r
++      return 1;\r
++    }\r
++\r
+     /* Dump output is one line per message. We match a sequence of\r
+      * non-space characters for the message-id, then one or more\r
+      * spaces, then a list of space-separated tags as a sequence of\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index a6d6d65..d4b424e 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -50,7 +50,6 @@ test_expect_success 'Restore with nothing to do, III' \\r
+   test_cmp dump.expected dump.actual'\r
+ \r
+ # notmuch restore currently only considers the first argument.\r
+-test_subtest_known_broken\r
+ test_expect_success 'Invalid restore invocation' \\r
+   'test_must_fail notmuch restore dump.expected another_one'\r
+ \r
+-- \r
+1.7.5.4\r
+\r