[PATCH 5/6] show: Support NULL values for message_set_{start, sep, end}

diff --git a/cc/d1f0326d85a22eebae91d70d92ee1342ff178f b/cc/d1f0326d85a22eebae91d70d92ee1342ff178f
new file mode 100644 (file)
index 0000000..cf79cb9
--- /dev/null
+++ b/cc/d1f0326d85a22eebae91d70d92ee1342ff178f
@@ -0,0 +1,162 @@
+Return-Path: <amthrax@drake.mit.edu>\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 AD8FF431FD6\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 MwBgVNUQTxfb for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Apr 2012 17:58:05 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id B8803431FDE\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
+X-AuditID: 12074424-b7fae6d000000906-a9-4f80e2987e10\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id DD.C3.02310.892E08F4; Sat,  7 Apr 2012 20:58:00 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q380vxZh007776; \r
+       Sat, 7 Apr 2012 20:57:59 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q380vw6r002169\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 7 Apr 2012 20:57:59 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SGgS6-0001SY-Cz; Sat, 07 Apr 2012 20:57:58 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/6] show: Support NULL values for message_set_{start, sep,\r
+       end}\r
+Date: Sat,  7 Apr 2012 20:57:49 -0400\r
+Message-Id: <1333846670-5356-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixG6nrjvjUYO/Qf8XeYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr4/zv12wFr4Qrfi9ZztjAeI6/i5GTQ0LAROLtxm2sELaYxIV7\r
+       69m6GLk4hAT2MUpM7utlgnDWM0r0tDSygFQJCdxjkrh8WhrCns8oMWFKBYjNJqAhsW3/ckYQ\r
+       W0RAWmLn3dlAUzk4mAXUJP50qYCEhQX8JHbcncQGEmYRUJX4viwbJMwrYC/RfmopO8QNChLP\r
+       1h1nArE5BRwktrduZYbYZC+xdPFxxgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpmuvl\r
+       ZpbopaaUbmIEB4yLyg7G5kNKhxgFOBiVeHgtdzf4C7EmlhVX5h5ilORgUhLlffoAKMSXlJ9S\r
+       mZFYnBFfVJqTWnyIUYKDWUmE9/5hoBxvSmJlVWpRPkxKmoNFSZxXQ+udn5BAemJJanZqakFq\r
+       EUxWhoNDSYL39UOgRsGi1PTUirTMnBKENBMHJ8hwHqDhko9AhhcXJOYWZ6ZD5E8xKkqJ874A\r
+       aRYASWSU5sH1wiL6FaM40CvCvN9BqniAyQCu+xXQYCagwTWv6kEGlyQipKQaGNO6dCbzZFhK\r
+       Nddc/Vv6tjtVfpPwmm9OV6ycG1xKnzJlejUv6g2wSNqiEJHeONffZqvUz8i1We7JUuXzY2/k\r
+       Htj1Q0M8qLjj8qIj5qZfD2h3KD3hFSxRmlC+MZXFd+kKW+68/nnHhW1105VeqOX+/Bqn/WRK\r
+       YcYnYb2vvkacwRFcHxjdouWUWIozEg21mIuKEwGsnnjvwwIAAA==\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: Sun, 08 Apr 2012 00:58:08 -0000\r
+\r
+Many formats don't need these, so it's more convenient if they don't\r
+have to set them at all.\r
+---\r
+ notmuch-show.c |   24 +++++++++++++++---------\r
+ 1 files changed, 15 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 5a71115..ef26ad2 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -844,17 +844,19 @@ show_messages (void *ctx,\r
+     int next_indent;\r
+     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;\r
+ \r
+-    fputs (format->message_set_start, stdout);\r
++    if (format->message_set_start)\r
++      fputs (format->message_set_start, stdout);\r
+ \r
+     for (;\r
+        notmuch_messages_valid (messages);\r
+        notmuch_messages_move_to_next (messages))\r
+     {\r
+-      if (!first_set)\r
++      if (!first_set && format->message_set_sep)\r
+           fputs (format->message_set_sep, stdout);\r
+       first_set = 0;\r
+ \r
+-      fputs (format->message_set_start, stdout);\r
++      if (format->message_set_start)\r
++          fputs (format->message_set_start, stdout);\r
+ \r
+       message = notmuch_messages_get (messages);\r
+ \r
+@@ -868,7 +870,7 @@ show_messages (void *ctx,\r
+               res = status;\r
+           next_indent = indent + 1;\r
+ \r
+-          if (!status)\r
++          if (!status && format->message_set_sep)\r
+               fputs (format->message_set_sep, stdout);\r
+       }\r
+ \r
+@@ -882,10 +884,12 @@ show_messages (void *ctx,\r
+ \r
+       notmuch_message_destroy (message);\r
+ \r
+-      fputs (format->message_set_end, stdout);\r
++      if (format->message_set_end)\r
++          fputs (format->message_set_end, stdout);\r
+     }\r
+ \r
+-    fputs (format->message_set_end, stdout);\r
++    if (format->message_set_end)\r
++      fputs (format->message_set_end, stdout);\r
+ \r
+     return res;\r
+ }\r
+@@ -931,7 +935,8 @@ do_show (void *ctx,\r
+     int first_toplevel = 1;\r
+     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;\r
+ \r
+-    fputs (format->message_set_start, stdout);\r
++    if (format->message_set_start)\r
++      fputs (format->message_set_start, stdout);\r
+ \r
+     for (threads = notmuch_query_search_threads (query);\r
+        notmuch_threads_valid (threads);\r
+@@ -945,7 +950,7 @@ do_show (void *ctx,\r
+           INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",\r
+                           notmuch_thread_get_thread_id (thread));\r
+ \r
+-      if (!first_toplevel)\r
++      if (!first_toplevel && format->message_set_sep)\r
+           fputs (format->message_set_sep, stdout);\r
+       first_toplevel = 0;\r
+ \r
+@@ -957,7 +962,8 @@ do_show (void *ctx,\r
+ \r
+     }\r
+ \r
+-    fputs (format->message_set_end, stdout);\r
++    if (format->message_set_end)\r
++      fputs (format->message_set_end, stdout);\r
+ \r
+     return res != NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+-- \r
+1.7.9.1\r
+\r