fix notmuch_message_file_get_header

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index 55c3dc1d8d75c8873fb64308d2e72b5d63cb661e..44b50aaa2c49ceea06825abea39256790f2c1a5d 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -153,7 +153,7 @@ _entries_resemble_maildir (struct dirent **entries, int count)
     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 ||
@@ -273,8 +273,19 @@ add_files_recursive (notmuch_database_t *notmuch,
 
        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
@@ -313,7 +324,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
        /* 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,
@@ -322,10 +333,10 @@ add_files_recursive (notmuch_database_t *notmuch,
 
            _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);
@@ -338,12 +349,18 @@ add_files_recursive (notmuch_database_t *notmuch,
                _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);
@@ -364,10 +381,10 @@ add_files_recursive (notmuch_database_t *notmuch,
        }
 
        /* 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;
        }
 
@@ -439,7 +456,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
     /* 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,
@@ -447,10 +464,10 @@ add_files_recursive (notmuch_database_t *notmuch,
 
        _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,
@@ -458,7 +475,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
        _filename_list_add (state->removed_directories, absolute);
 
-       notmuch_filenames_advance (db_subdirs);
+       notmuch_filenames_move_to_next (db_subdirs);
     }
 
     if (! interrupted) {
@@ -618,22 +635,26 @@ count_files (const char *path, int *count)
 
 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);
 }
@@ -655,8 +676,8 @@ _remove_directory (void *ctx,
     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));
@@ -669,8 +690,8 @@ _remove_directory (void *ctx,
     }
 
     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));