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)
+ if (entry->d_type != DT_DIR && entry->d_type != DT_LNK
+ && entry->d_type != DT_UNKNOWN)
continue;
/* Ignore special directories to avoid infinite recursion.
/* 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) {
+ if (entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN) {
int err;
next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
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;
+
+ 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 ("Upgraded %d of %d messages (", count, total);
- notmuch_time_print_formatted_seconds (time_remaining);
- printf (" remaining). \r");
+ printf (". \r");
fflush (stdout);
}