From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [RFC 2/5] cli: don't call _entry_in_ignore_list twice in count files debug
Date: Tue, 3 Nov 2015 21:49:30 +0200 [thread overview]
Message-ID: <ef2e3009ed104d2bf801536f203d0f2f95a29336.1446579858.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1446579858.git.jani@nikula.org>
In-Reply-To: <cover.1446579858.git.jani@nikula.org>
Split file ignores in count_files to fixed and user configured in
order to not have to call _entry_in_ignore_list twice when debugging
is enabled. Minor detail.
---
notmuch-new.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/notmuch-new.c b/notmuch-new.c
index e5037761c8ee..da1d1be2ed3b 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -734,18 +734,20 @@ count_files (const char *path, int *count, add_files_state_t *state)
entry = fs_entries[i];
/* Ignore special directories to avoid infinite recursion.
- * Also ignore the .notmuch directory and files/directories
- * the user has configured to be ignored.
+ * Also ignore the .notmuch directory.
*/
if (strcmp (entry->d_name, ".") == 0 ||
strcmp (entry->d_name, "..") == 0 ||
- strcmp (entry->d_name, ".notmuch") == 0 ||
- _entry_in_ignore_list (entry->d_name, state))
- {
- if (state->debug && _entry_in_ignore_list (entry->d_name, state))
+ strcmp (entry->d_name, ".notmuch") == 0)
+ continue;
+
+ /* Ignore any files/directories the user has configured to be
+ * ignored
+ */
+ if (_entry_in_ignore_list (entry->d_name, state)) {
+ if (state->debug)
printf ("(D) count_files: explicitly ignoring %s/%s\n",
- path,
- entry->d_name);
+ path, entry->d_name);
continue;
}
--
2.1.4
next prev parent reply other threads:[~2015-11-03 19:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 19:49 [RFC 0/5] globbing on new.ignore etc Jani Nikula
2015-11-03 19:49 ` [RFC 1/5] cli: fix function name in notmuch new debug logging Jani Nikula
2015-12-30 15:31 ` David Bremner
2015-11-03 19:49 ` Jani Nikula [this message]
2016-04-09 23:56 ` [RFC 2/5] cli: don't call _entry_in_ignore_list twice in count files debug David Bremner
2015-11-03 19:49 ` [RFC 3/5] cli: support shell globbing patterns in new.ignore Jani Nikula
2016-04-10 0:37 ` David Bremner
2017-03-11 14:35 ` David Bremner
2015-11-03 19:49 ` [RFC 4/5] cli: add notmuch config append command to append to string list configs Jani Nikula
2015-11-03 19:49 ` [RFC 5/5] cli: print number of ignored non-mails encountered in notmuch new scan Jani Nikula
2017-03-11 14:42 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ef2e3009ed104d2bf801536f203d0f2f95a29336.1446579858.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).