From 4bfbff21775e68555fd83433ad1720c486f25739 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sat, 19 May 2012 00:13:42 +2000 Subject: [PATCH] [PATCH 9/9] lib: Don't needlessly create directory docs in _notmuch_message_remove_filename --- f9/7efadd6b4d46f8464d70147fed7158ca80c33b | 98 +++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 f9/7efadd6b4d46f8464d70147fed7158ca80c33b diff --git a/f9/7efadd6b4d46f8464d70147fed7158ca80c33b b/f9/7efadd6b4d46f8464d70147fed7158ca80c33b new file mode 100644 index 000000000..6cd682fa3 --- /dev/null +++ b/f9/7efadd6b4d46f8464d70147fed7158ca80c33b @@ -0,0 +1,98 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 2416D429E27 + for ; Thu, 17 May 2012 21:13:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 8XNm-XhW3OFt for ; + Thu, 17 May 2012 21:13:55 -0700 (PDT) +Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU + [18.9.25.12]) + by olra.theworths.org (Postfix) with ESMTP id 3634B431FD7 + for ; Thu, 17 May 2012 21:13:53 -0700 (PDT) +X-AuditID: 1209190c-b7fad6d000000920-fd-4fb5cc8004a3 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP + id E7.1D.02336.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q4I4DqOM009483; + Fri, 18 May 2012 00:13:52 -0400 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4I4Dp4c026797 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Fri, 18 May 2012 00:13:52 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SVEZb-0000zL-6K; Fri, 18 May 2012 00:13:51 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 9/9] lib: Don't needlessly create directory docs in + _notmuch_message_remove_filename +Date: Fri, 18 May 2012 00:13:42 -0400 +Message-Id: <1337314423-3702-10-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu> +References: <1337314423-3702-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrttwZqu/wavzOhbXb85kdmD0eLbq + FnMAYxSXTUpqTmZZapG+XQJXxqTWeewFz9kq+q52MTUwnmDtYuTkkBAwkZgwdRUjhC0mceHe + erYuRi4OIYF9jBKfbzWCFQkJbGCU2HVbFiJxn0li1f23TBDOLEaJZxuPsYBUsQloSGzbvxxs + lIiAtMTOu7OBujk4mAXUJP50qYCEhQVSJI40nwMrYRFQlZh9fj6YzSvgIHH23BOoi+Qlnt7v + YwNp5QSKTzseDXGDvcS/C80sExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFL + TSndxAgKGU5Jnh2Mbw4qHWIU4GBU4uHdMWervxBrYllxZe4hRkkOJiVR3u8ngUJ8SfkplRmJ + xRnxRaU5qcWHGCU4mJVEeGW7gXK8KYmVValF+TApaQ4WJXFeFa13fkIC6YklqdmpqQWpRTBZ + GQ4OJQnet6eBGgWLUtNTK9Iyc0oQ0kwcnCDDeUCGnwEZXlyQmFucmQ6RP8WoKCXO+wOkWQAk + kVGaB9cLi+lXjOJArwjzcoC08wDTAVz3K6DBTECDy3I3gQwuSURISTUwbl/Rfsxk5v+WrlCJ + slMVCYLTzgj5pZ3M7HDwTfUW3bsi3Ldm4rT593KDVVJz/v1bPbWtqlhec/76PvEbChLZQUEM + f2f3XJNyS/1q/4vl1xK1KiljuZcXvql196k3Lj2c5XPedX2std/sxIo8SZFnbyOYL/qsO2sk + 8en0aqYrp2RWNf+UMZdWYinOSDTUYi4qTgQATePa2cQCAAA= +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 18 May 2012 04:13:56 -0000 + +Previously, if passed a filename with a directory that did not exist +in the database, _notmuch_message_remove_filename would needlessly +create that directory document. Fix it so that doesn't happen. +--- + lib/message.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/message.cc b/lib/message.cc +index 8d552f1..6787506 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -541,8 +541,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message, + Xapian::TermIterator i, last; + + status = _notmuch_database_filename_to_direntry ( +- local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry); +- if (status) ++ local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry); ++ if (status || !direntry) + return status; + + /* Unlink this file from its parent directory. */ +-- +1.7.10 + -- 2.26.2