debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch to fix broken "notmuch setup" and "notmuch new"

Browse source 
I'm trying to stick to a habit of fixing previously-introduced bugs
on side branches off of the commit that introduced the bug. The
idea here is to make it easy to find the commits to cherry pick
if bisecting in the future lands on one of the broken commits.
This commit is contained in:
Carl Worth 2009-10-27 16:12:04 -07:00
commit b0190e59ac
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
notmuch.c
View file

@ -180,7 +180,7 @@ add_files_recursive (notmuch_database_t *notmuch,
char *next = NULL; char *next = NULL;
time_t path_mtime, path_dbtime; time_t path_mtime, path_dbtime;
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message, **closure; notmuch_message_t *message = NULL, **closure;
/* If we're told to, we bail out on encountering a read-only /* If we're told to, we bail out on encountering a read-only
* directory, (with this being a clear clue from the user to * directory, (with this being a clear clue from the user to
@ -266,7 +266,6 @@ add_files_recursive (notmuch_database_t *notmuch,
state->added_messages++; state->added_messages++;
if (state->callback) if (state->callback)
(state->callback) (message); (state->callback) (message);
notmuch_message_destroy (message);
break; break;
/* Non-fatal issues (go on to next file) */ /* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
@ -292,6 +291,12 @@ add_files_recursive (notmuch_database_t *notmuch,
INTERNAL_ERROR ("add_message returned unexpected value: %d", status); INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE; goto DONE;
} }
if (message) {
notmuch_message_destroy (message);
message = NULL;
}
if (state->processed_files % 1000 == 0) if (state->processed_files % 1000 == 0)
add_files_print_progress (state); add_files_print_progress (state);
} }