aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Austin Clements <amdragon@MIT.EDU>2012-04-22 11:50:49 -0400
committerGravatar David Bremner <bremner@debian.org>2012-04-24 23:25:51 -0300
commite075ee37c9d42673e7e8b1d045915841b059735c (patch)
tree999984ddba42a09cc8e6d5aa0e9c4122121e3774
parentff53fb468e160c8c6910078cfa92dcb6b5caa728 (diff)
new: Consistently treat fatal errors as fatal
Previously, fatal errors in add_files_recursive were not treated as fatal by its callers (including itself!). This makes add_files_recursive errors consistently fatal and updates all callers to treat them as fatal.
-rw-r--r--notmuch-new.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/notmuch-new.c b/notmuch-new.c
index 4f13535c..15c0b36d 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -308,6 +308,10 @@ add_files_recursive (notmuch_database_t *notmuch,
if (num_fs_entries == -1) {
fprintf (stderr, "Error opening directory %s: %s\n",
path, strerror (errno));
+ /* We consider this a fatal error because, if a user moved a
+ * message from another directory that we were able to scan
+ * into this directory, skipping this directory will cause
+ * that message to be lost. */
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
@@ -351,8 +355,10 @@ add_files_recursive (notmuch_database_t *notmuch,
next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
status = add_files_recursive (notmuch, next, state);
- if (status && ret == NOTMUCH_STATUS_SUCCESS)
+ if (status) {
ret = status;
+ goto DONE;
+ }
talloc_free (next);
next = NULL;
}
@@ -933,6 +939,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
}
ret = add_files (notmuch, db_path, &add_files_state);
+ if (ret)
+ goto DONE;
gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
@@ -965,6 +973,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
}
}
+ DONE:
talloc_free (add_files_state.removed_files);
talloc_free (add_files_state.removed_directories);
talloc_free (add_files_state.directory_mtimes);
@@ -1012,10 +1021,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
printf ("\n");
- if (ret) {
- printf ("\nNote: At least one error was encountered: %s\n",
+ if (ret)
+ printf ("\nNote: A fatal error was encountered: %s\n",
notmuch_status_to_string (ret));
- }
notmuch_database_close (notmuch);