debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 21:54:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: Consistently treat fatal errors as fatal

Browse source 
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.
This commit is contained in:
Austin Clements 2012-04-22 11:50:49 -04:00 committed by David Bremner
parent ff53fb468e
commit e075ee37c9
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
notmuch-new.c
View file

@ -308,6 +308,10 @@ add_files_recursive (notmuch_database_t *notmuch,
if (num_fs_entries == -1) { if (num_fs_entries == -1) {
fprintf (stderr, "Error opening directory %s: %s\n", fprintf (stderr, "Error opening directory %s: %s\n",
path, strerror (errno)); 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; ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE; goto DONE;
} }
@ -351,8 +355,10 @@ add_files_recursive (notmuch_database_t *notmuch,
next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
status = add_files_recursive (notmuch, next, state); status = add_files_recursive (notmuch, next, state);
if (status && ret == NOTMUCH_STATUS_SUCCESS) if (status) {
ret = status; ret = status;
goto DONE;
}
talloc_free (next); talloc_free (next);
next = NULL; next = NULL;
} }
@ -933,6 +939,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
} }
ret = add_files (notmuch, db_path, &add_files_state); ret = add_files (notmuch, db_path, &add_files_state);
if (ret)
goto DONE;
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) {
@ -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_files);
talloc_free (add_files_state.removed_directories); talloc_free (add_files_state.removed_directories);
talloc_free (add_files_state.directory_mtimes); talloc_free (add_files_state.directory_mtimes);
@ -1012,10 +1021,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
printf ("\n"); printf ("\n");
if (ret) { if (ret)
printf ("\nNote: At least one error was encountered: %s\n", printf ("\nNote: A fatal error was encountered: %s\n",
notmuch_status_to_string (ret)); notmuch_status_to_string (ret));
}
notmuch_database_close (notmuch); notmuch_database_close (notmuch);