--- /dev/null
+Return-Path: <amdragon@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 7DAF0429E26\r
+ for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:54 -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 Q5RtEdegnuzs for <notmuch@notmuchmail.org>;\r
+ Thu, 17 May 2012 21:13:53 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id DDBED431FC2\r
+ for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:52 -0700 (PDT)\r
+X-AuditID: 12074422-b7fd66d0000008f9-89-4fb5cc801be8\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 83.DF.02297.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q4I4DpwB021451; \r
+ Fri, 18 May 2012 00:13:51 -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 q4I4DoVJ026786\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Fri, 18 May 2012 00:13:51 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SVEZa-0000z3-3l; Fri, 18 May 2012 00:13:50 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/9] lib: Perform the same transformation to\r
+ _notmuch_database_filename_to_direntry\r
+Date: Fri, 18 May 2012 00:13:36 -0400\r
+Message-Id: <1337314423-3702-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
+References: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixG6nottwZqu/wcvlEhbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxpXTdQVTZSqm3bBpYDwo1sXIySEhYCKxef8WRghbTOLCvfVs\r
+ XYxcHEIC+xglrr/awAjhbGCUmND6iAnCuc8ksWP7dhYIZxajxI+Xh1lB+tkENCS27V8ONktE\r
+ QFpi593ZQHEODmYBNYk/XSogYWGBFIkjPS1g5SwCqhLXt+1gArF5BewlfrdeZoI4Q17i6f0+\r
+ NpBWTgEHiWnHo0HCQkAl/y40s0xg5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11QvN7NE\r
+ LzWldBMjOGBclHYw/jyodIhRgINRiYd3x5yt/kKsiWXFlbmHGCU5mJREeb+fBArxJeWnVGYk\r
+ FmfEF5XmpBYfYpTgYFYS4ZXtBsrxpiRWVqUW5cOkpDlYlMR51bXe+QkJpCeWpGanphakFsFk\r
+ ZTg4lCR4LU4DNQoWpaanVqRl5pQgpJk4OEGG8wANzwSp4S0uSMwtzkyHyJ9iVJQS5y0DSQiA\r
+ JDJK8+B6YRH9ilEc6BVh3lCQKh5gMoDrfgU0mAlocFnuJpDBJYkIKakGRov0Vt+yvY/lexeH\r
+ NtZosjbc+Z9korJn152sjX05q/QMGXedXP3Wc8Wirh8qoWkW7cXzzXQlBI2Noy02MtfquBvy\r
+ JrAf2FRy85bnpZWGr+uOcDntdPt8XW1Bsf30qJSztit8OrZcPCa+MfT9r4dC5bfYdN79y9ad\r
+ 36MRJaDLxVXLepPNdxeXEktxRqKhFnNRcSIA5wWB0MMCAAA=\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, 18 May 2012 04:13:54 -0000\r
+\r
+Now _notmuch_database_filename_to_direntry takes a flags argument and\r
+can indicate if the necessary directory documents do not exist.\r
+Again, callers have been updated, but retain their original behavior.\r
+---\r
+ lib/database.cc | 17 +++++++++++------\r
+ lib/message.cc | 9 ++++-----\r
+ lib/notmuch-private.h | 1 +\r
+ 3 files changed, 16 insertions(+), 11 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 716982d..b4c76b4 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1248,13 +1248,16 @@ _notmuch_database_get_directory_path (void *ctx,\r
+ * database path), return a new string (with 'ctx' as the talloc\r
+ * owner) suitable for use as a direntry term value.\r
+ *\r
+- * The necessary directory documents will be created in the database\r
+- * as needed.\r
++ * If (flags & NOTMUCH_FIND_CREATE), the necessary directory documents\r
++ * will be created in the database as needed. Otherwise, if the\r
++ * necessary directory documents do not exist, this sets\r
++ * *direntry to NULL and returns NOTMUCH_STATUS_SUCCESS.\r
+ */\r
+ notmuch_status_t\r
+ _notmuch_database_filename_to_direntry (void *ctx,\r
+ notmuch_database_t *notmuch,\r
+ const char *filename,\r
++ notmuch_find_flags_t flags,\r
+ char **direntry)\r
+ {\r
+ const char *relative, *directory, *basename;\r
+@@ -1268,10 +1271,12 @@ _notmuch_database_filename_to_direntry (void *ctx,\r
+ if (status)\r
+ return status;\r
+ \r
+- status = _notmuch_database_find_directory_id (notmuch, directory, NOTMUCH_FIND_CREATE,\r
++ status = _notmuch_database_find_directory_id (notmuch, directory, flags,\r
+ &directory_id);\r
+- if (status)\r
++ if (status || directory_id == (unsigned int)-1) {\r
++ *direntry = NULL;\r
+ return status;\r
++ }\r
+ \r
+ *direntry = talloc_asprintf (ctx, "%u:%s", directory_id, basename);\r
+ \r
+@@ -1892,8 +1897,8 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,\r
+ local = talloc_new (notmuch);\r
+ \r
+ try {\r
+- status = _notmuch_database_filename_to_direntry (local, notmuch,\r
+- filename, &direntry);\r
++ status = _notmuch_database_filename_to_direntry (\r
++ local, notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);\r
+ if (status)\r
+ goto DONE;\r
+ \r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 0075425..8d552f1 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -495,9 +495,8 @@ _notmuch_message_add_filename (notmuch_message_t *message,\r
+ if (status)\r
+ return status;\r
+ \r
+- status = _notmuch_database_filename_to_direntry (local,\r
+- message->notmuch,\r
+- filename, &direntry);\r
++ status = _notmuch_database_filename_to_direntry (\r
++ local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);\r
+ if (status)\r
+ return status;\r
+ \r
+@@ -541,8 +540,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
+ notmuch_status_t status;\r
+ Xapian::TermIterator i, last;\r
+ \r
+- status = _notmuch_database_filename_to_direntry (local, message->notmuch,\r
+- filename, &direntry);\r
++ status = _notmuch_database_filename_to_direntry (\r
++ local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);\r
+ if (status)\r
+ return status;\r
+ \r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index a36549d..34f7ac7 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -207,6 +207,7 @@ notmuch_status_t\r
+ _notmuch_database_filename_to_direntry (void *ctx,\r
+ notmuch_database_t *notmuch,\r
+ const char *filename,\r
++ notmuch_find_flags_t flags,\r
+ char **direntry);\r
+ \r
+ /* directory.cc */\r
+-- \r
+1.7.10\r
+\r
projects / notmuch-archives.git / commitdiff