static int ino_cmp(const struct dirent **a, const struct dirent **b)
{
- return ((*a)->d_ino < (*b)->d_ino)? -1: 1;
+ return ((*a)->d_ino < (*b)->d_ino) ? -1 : 1;
}
/* Examine 'path' recursively as follows:
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message = NULL;
struct dirent **namelist = NULL;
+ int num_entries;
/* If we're told to, we bail out on encountering a read-only
* directory, (with this being a clear clue from the user to
path_mtime = st->st_mtime;
path_dbtime = notmuch_database_get_timestamp (notmuch, path);
- int n_entries= scandir(path, &namelist, 0, ino_cmp);
+ num_entries = scandir (path, &namelist, 0, ino_cmp);
- if (n_entries == -1) {
+ if (num_entries == -1) {
fprintf (stderr, "Error opening directory %s: %s\n",
path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
int i=0;
while (!interrupted) {
- if (i == n_entries)
+ if (i == num_entries)
break;
entry= namelist[i++];
static void
count_files (const char *path, int *count)
{
- DIR *dir;
- struct dirent *e, *entry = NULL;
- int entry_length;
- int err;
+ struct dirent *entry = NULL;
char *next;
struct stat st;
+ struct dirent **namelist = NULL;
+ int n_entries = scandir (path, &namelist, 0, ino_cmp);
+ int i = 0;
- dir = opendir (path);
-
- if (dir == NULL) {
+ if (n_entries == -1) {
fprintf (stderr, "Warning: failed to open directory %s: %s\n",
path, strerror (errno));
goto DONE;
}
- entry_length = offsetof (struct dirent, d_name) +
- pathconf (path, _PC_NAME_MAX) + 1;
- entry = malloc (entry_length);
-
while (!interrupted) {
- err = readdir_r (dir, entry, &e);
- if (err) {
- fprintf (stderr, "Error reading directory: %s\n",
- strerror (errno));
- free (entry);
- goto DONE;
- }
-
- if (e == NULL)
+ if (i == n_entries)
break;
+ entry= namelist[i++];
+
/* Ignore special directories to avoid infinite recursion.
* Also ignore the .notmuch directory.
*/
DONE:
if (entry)
free (entry);
-
- closedir (dir);
+ if (namelist)
+ free (namelist);
}
int
if (interrupted)
return 1;
+ printf ("Found %d total files. \n", count);
notmuch = notmuch_database_create (db_path);
add_files_state.ignore_read_only_directories = FALSE;
add_files_state.total_files = count;
dot_notmuch_path = NULL;
add_files_state.saw_read_only_directory = FALSE;
- add_files_state.total_files = 0;
add_files_state.processed_files = 0;
add_files_state.added_messages = 0;
gettimeofday (&add_files_state.tv_start, NULL);