[PATCH 2/3] new: Handle fatal errors in remove_filename and _remove_directory

[Mark Walters]

On Mon, 27 Feb 2012, Austin Clements <amdragon at MIT.EDU> wrote:
> Previously such errors were simply ignored.  Now they cause an
> immediate cleanup and abort.

This one looks fine except for a minor query.

> ---
>  notmuch-new.c |   24 ++++++++++++++++++------
>  1 files changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/notmuch-new.c b/notmuch-new.c
> index bd9786a..0cbd479 100644
> --- a/notmuch-new.c
> +++ b/notmuch-new.c
> @@ -780,8 +780,10 @@ remove_filename (notmuch_database_t *notmuch,
>  	add_files_state->renamed_messages++;
>  	if (add_files_state->synchronize_flags == TRUE)
>  	    notmuch_message_maildir_flags_to_tags (message);
> -    } else
> +	status = NOTMUCH_STATUS_SUCCESS;
> +    } else if (status == NOTMUCH_STATUS_SUCCESS) {
>  	add_files_state->removed_messages++;
> +    }
>      notmuch_message_destroy (message);
>      notmuch_database_end_atomic (notmuch);
>      return status;
> @@ -789,12 +791,13 @@ remove_filename (notmuch_database_t *notmuch,
>  
>  /* Recursively remove all filenames from the database referring to
>   * 'path' (or to any of its children). */
> -static void
> +static notmuch_status_t
>  _remove_directory (void *ctx,
>  		   notmuch_database_t *notmuch,
>  		   const char *path,
>  		   add_files_state_t *add_files_state)
>  {
> +    notmuch_status_t status;
>      notmuch_directory_t *directory;
>      notmuch_filenames_t *files, *subdirs;
>      char *absolute;
> @@ -807,8 +810,10 @@ _remove_directory (void *ctx,
>      {
>  	absolute = talloc_asprintf (ctx, "%s/%s", path,
>  				    notmuch_filenames_get (files));
> -	remove_filename (notmuch, absolute, add_files_state);
> +	status = remove_filename (notmuch, absolute, add_files_state);
>  	talloc_free (absolute);
> +	if (status)
> +	    return status;
>      }
>  
>      for (subdirs = notmuch_directory_get_child_directories (directory);
> @@ -817,11 +822,14 @@ _remove_directory (void *ctx,
>      {
>  	absolute = talloc_asprintf (ctx, "%s/%s", path,
>  				    notmuch_filenames_get (subdirs));
> -	_remove_directory (ctx, notmuch, absolute, add_files_state);
> +	status = _remove_directory (ctx, notmuch, absolute, add_files_state);
>  	talloc_free (absolute);
> +	if (status)
> +	    return status;
>      }
>  
>      notmuch_directory_destroy (directory);
> +    return NOTMUCH_STATUS_SUCCESS;
>  }

In the two "return status" lines above seem to mean we don't call
notmuch_directory_destroy. Does that matter?

The other query is not actually about this patch: just something that
came up when reading it. Should notmuch_database_begin_atomic and
notmuch_database_end_atomic always be paired? One of the (existing)
error cases in remove_filename seems to return without calling end.

Best wishes

Mark

>  int
> @@ -939,7 +947,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
>  
>      gettimeofday (&tv_start, NULL);
>      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) {
>  	    do_print_progress = 0;
>  	    generic_print_progress ("Cleaned up", "messages",
> @@ -950,7 +960,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
>  
>      gettimeofday (&tv_start, NULL);
>      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) {
>  	    do_print_progress = 0;
>  	    generic_print_progress ("Cleaned up", "directories",
> -- 
> 1.7.7.3
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch