int i, found = 0;
for (i = 0; i < count; i++) {
- if (entries[i]->d_type != DT_DIR)
+ if (entries[i]->d_type != DT_DIR && entries[i]->d_type != DT_UNKNOWN)
continue;
if (strcmp(entries[i]->d_name, "new") == 0 ||
entry = fs_entries[i];
- if (entry->d_type != DT_DIR && entry->d_type != DT_LNK)
+ /* We only want to descend into directories.
+ * But symlinks can be to directories too, of course.
+ *
+ * And if the filesystem doesn't tell us the file type in the
+ * scandir results, then it might be a directory (and if not,
+ * then we'll stat and return immediately in the next level of
+ * recursion). */
+ if (entry->d_type != DT_DIR &&
+ entry->d_type != DT_LNK &&
+ entry->d_type != DT_UNKNOWN)
+ {
continue;
+ }
/* Ignore special directories to avoid infinite recursion.
* Also ignore the .notmuch directory and any "tmp" directory
/* Check if we've walked past any names in db_files or
* db_subdirs. If so, these have been deleted. */
- while (notmuch_filenames_has_more (db_files) &&
+ while (notmuch_filenames_valid (db_files) &&
strcmp (notmuch_filenames_get (db_files), entry->d_name) < 0)
{
char *absolute = talloc_asprintf (state->removed_files,
_filename_list_add (state->removed_files, absolute);
- notmuch_filenames_advance (db_files);
+ notmuch_filenames_move_to_next (db_files);
}
- while (notmuch_filenames_has_more (db_subdirs) &&
+ while (notmuch_filenames_valid (db_subdirs) &&
strcmp (notmuch_filenames_get (db_subdirs), entry->d_name) <= 0)
{
const char *filename = notmuch_filenames_get (db_subdirs);
_filename_list_add (state->removed_directories, absolute);
}
- notmuch_filenames_advance (db_subdirs);
+ notmuch_filenames_move_to_next (db_subdirs);
}
/* If we're looking at a symlink, we only want to add it if it
- * links to a regular file, (and not to a directory, say). */
- if (entry->d_type == DT_LNK) {
+ * links to a regular file, (and not to a directory, say).
+ *
+ * Similarly, if the file is of unknown type (due to filesytem
+ * limitations), then we also need to look closer.
+ *
+ * In either case, a stat does the trick.
+ */
+ if (entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN) {
int err;
next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
}
/* Don't add a file that we've added before. */
- if (notmuch_filenames_has_more (db_files) &&
+ if (notmuch_filenames_valid (db_files) &&
strcmp (notmuch_filenames_get (db_files), entry->d_name) == 0)
{
- notmuch_filenames_advance (db_files);
+ notmuch_filenames_move_to_next (db_files);
continue;
}
/* Now that we've walked the whole filesystem list, anything left
* over in the database lists has been deleted. */
- while (notmuch_filenames_has_more (db_files))
+ while (notmuch_filenames_valid (db_files))
{
char *absolute = talloc_asprintf (state->removed_files,
"%s/%s", path,
_filename_list_add (state->removed_files, absolute);
- notmuch_filenames_advance (db_files);
+ notmuch_filenames_move_to_next (db_files);
}
- while (notmuch_filenames_has_more (db_subdirs))
+ while (notmuch_filenames_valid (db_subdirs))
{
char *absolute = talloc_asprintf (state->removed_directories,
"%s/%s", path,
_filename_list_add (state->removed_directories, absolute);
- notmuch_filenames_advance (db_subdirs);
+ notmuch_filenames_move_to_next (db_subdirs);
}
if (! interrupted) {
static void
upgrade_print_progress (void *closure,
- unsigned int count,
- unsigned int total)
+ double progress)
{
add_files_state_t *state = closure;
- struct timeval tv_now;
- double elapsed_overall, rate_overall, time_remaining;
- gettimeofday (&tv_now, NULL);
+ printf ("Upgrading database: %.2f%% complete", progress * 100.0);
- elapsed_overall = notmuch_time_elapsed (state->tv_start, tv_now);
- rate_overall = count / elapsed_overall;
- time_remaining = ((total - count) / rate_overall);
+ if (progress > 0) {
+ struct timeval tv_now;
+ double elapsed, time_remaining;
- printf ("Upgraded %d of %d messages (", count, total);
- notmuch_time_print_formatted_seconds (time_remaining);
- printf (" remaining). \r");
+ gettimeofday (&tv_now, NULL);
+
+ elapsed = notmuch_time_elapsed (state->tv_start, tv_now);
+ time_remaining = (elapsed / progress) * (1.0 - progress);
+ printf (" (");
+ notmuch_time_print_formatted_seconds (time_remaining);
+ printf (" remaining)");
+ }
+
+ printf (". \r");
fflush (stdout);
}
directory = notmuch_database_get_directory (notmuch, path);
for (files = notmuch_directory_get_child_files (directory);
- notmuch_filenames_has_more (files);
- notmuch_filenames_advance (files))
+ notmuch_filenames_valid (files);
+ notmuch_filenames_move_to_next (files))
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (files));
}
for (subdirs = notmuch_directory_get_child_directories (directory);
- notmuch_filenames_has_more (subdirs);
- notmuch_filenames_advance (subdirs))
+ notmuch_filenames_valid (subdirs);
+ notmuch_filenames_move_to_next (subdirs))
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (subdirs));
}
}
- /* Setup our handler for SIGINT */
- memset (&action, 0, sizeof (struct sigaction));
- action.sa_handler = handle_sigint;
- sigemptyset (&action.sa_mask);
- action.sa_flags = SA_RESTART;
- sigaction (SIGINT, &action, NULL);
-
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
return 1;
if (notmuch == NULL)
return 1;
+ /* Setup our handler for SIGINT. We do this after having
+ * potentially done a database upgrade we this interrupt handler
+ * won't support. */
+ memset (&action, 0, sizeof (struct sigaction));
+ action.sa_handler = handle_sigint;
+ sigemptyset (&action.sa_mask);
+ action.sa_flags = SA_RESTART;
+ sigaction (SIGINT, &action, NULL);
+
talloc_free (dot_notmuch_path);
dot_notmuch_path = NULL;