debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: use dirent_type in count_files too

Browse source 
Avoid an extra stat per file, if possible, also when counting the
files for initial indexing.
This commit is contained in:
Jani Nikula 2014-01-19 22:32:24 +02:00 committed by David Bremner
parent 65ebd34329
commit 0b247cb411
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
notmuch-new.c
View file

@ -702,9 +702,9 @@ count_files (const char *path, int *count, add_files_state_t *state)
{
struct dirent *entry = NULL;
char *next;
struct stat st;
struct dirent **fs_entries = NULL;
int num_fs_entries = scandir (path, &fs_entries, 0, dirent_sort_inode);
int entry_type;
int i = 0;
if (num_fs_entries == -1) {
@ -742,15 +742,14 @@ count_files (const char *path, int *count, add_files_state_t *state)
continue;
}
stat (next, &st);
if (S_ISREG (st.st_mode)) {
entry_type = dirent_type (path, entry);
if (entry_type == S_IFREG) {
*count = *count + 1;
if (*count % 1000 == 0) {
printf ("Found %d files so far.\r", *count);
fflush (stdout);
}
} else if (S_ISDIR (st.st_mode)) {
} else if (entry_type == S_IFDIR) {
count_files (next, count, state);
}