debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: Handle fatal errors in remove_filename and _remove_directory

Browse source 
Previously such errors were simply ignored.  Now they cause an
immediate cleanup and abort.
This commit is contained in:
Austin Clements 2012-04-22 11:50:50 -04:00 committed by David Bremner
parent e075ee37c9
commit d3b5533123
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
notmuch-new.c
View file

@ -785,8 +785,10 @@ remove_filename (notmuch_database_t *notmuch,
add_files_state->renamed_messages++; add_files_state->renamed_messages++;
if (add_files_state->synchronize_flags == TRUE) if (add_files_state->synchronize_flags == TRUE)
notmuch_message_maildir_flags_to_tags (message); notmuch_message_maildir_flags_to_tags (message);
} else status = NOTMUCH_STATUS_SUCCESS;
} else if (status == NOTMUCH_STATUS_SUCCESS) {
add_files_state->removed_messages++; add_files_state->removed_messages++;
}
notmuch_message_destroy (message); notmuch_message_destroy (message);
notmuch_database_end_atomic (notmuch); notmuch_database_end_atomic (notmuch);
return status; return status;
@ -794,12 +796,13 @@ remove_filename (notmuch_database_t *notmuch,
/* Recursively remove all filenames from the database referring to /* Recursively remove all filenames from the database referring to
* 'path' (or to any of its children). */ * 'path' (or to any of its children). */
static void static notmuch_status_t
_remove_directory (void *ctx, _remove_directory (void *ctx,
notmuch_database_t *notmuch, notmuch_database_t *notmuch,
const char *path, const char *path,
add_files_state_t *add_files_state) add_files_state_t *add_files_state)
{ {
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
notmuch_directory_t *directory; notmuch_directory_t *directory;
notmuch_filenames_t *files, *subdirs; notmuch_filenames_t *files, *subdirs;
char *absolute; char *absolute;
@ -812,8 +815,10 @@ _remove_directory (void *ctx,
{ {
absolute = talloc_asprintf (ctx, "%s/%s", path, absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (files)); notmuch_filenames_get (files));
remove_filename (notmuch, absolute, add_files_state); status = remove_filename (notmuch, absolute, add_files_state);
talloc_free (absolute); talloc_free (absolute);
if (status)
goto DONE;
} }
for (subdirs = notmuch_directory_get_child_directories (directory); for (subdirs = notmuch_directory_get_child_directories (directory);
@ -822,11 +827,15 @@ _remove_directory (void *ctx,
{ {
absolute = talloc_asprintf (ctx, "%s/%s", path, absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (subdirs)); notmuch_filenames_get (subdirs));
_remove_directory (ctx, notmuch, absolute, add_files_state); status = _remove_directory (ctx, notmuch, absolute, add_files_state);
talloc_free (absolute); talloc_free (absolute);
if (status)
goto DONE;
} }
DONE:
notmuch_directory_destroy (directory); notmuch_directory_destroy (directory);
return status;
} }
int int
@ -944,7 +953,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
gettimeofday (&tv_start, NULL); gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) { for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
remove_filename (notmuch, f->filename, &add_files_state); ret = remove_filename (notmuch, f->filename, &add_files_state);
if (ret)
goto DONE;
if (do_print_progress) { if (do_print_progress) {
do_print_progress = 0; do_print_progress = 0;
generic_print_progress ("Cleaned up", "messages", generic_print_progress ("Cleaned up", "messages",
@ -955,7 +966,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
gettimeofday (&tv_start, NULL); gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) { for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {
_remove_directory (ctx, notmuch, f->filename, &add_files_state); ret = _remove_directory (ctx, notmuch, f->filename, &add_files_state);
if (ret)
goto DONE;
if (do_print_progress) { if (do_print_progress) {
do_print_progress = 0; do_print_progress = 0;
generic_print_progress ("Cleaned up", "directories", generic_print_progress ("Cleaned up", "directories",