diff options
| author | David Bremner <david@tethera.net> | 2014-12-27 19:12:49 +0100 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2015-03-29 00:34:15 +0100 |
| commit | 84d3b15d251623cbb66e5eca7ddb8d61aa596d33 (patch) | |
| tree | 73e7cca41e1b9e720f1e57eea58dc56e496cb4a3 /notmuch-search.c | |
| parent | 83298fa0f8e7717a260c1f88edd7bf545709562d (diff) | |
lib: add "verbose" versions of notmuch_database_{open,create}
The compatibility wrapper ensures that clients calling
notmuch_database_open will receive consistent output for now.
The changes to notmuch-{new,search} and test/symbol-test are just to
make the test suite pass.
The use of IGNORE_RESULT is justified by two things. 1) I don't know
what else to do. 2) asprintf guarantees the output string is NULL if
an error occurs, so at least we are not passing garbage back.
Diffstat (limited to 'notmuch-search.c')
| -rw-r--r-- | notmuch-search.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/notmuch-search.c b/notmuch-search.c index a591d45b..b81ac013 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -545,6 +545,7 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar { char *query_str; unsigned int i; + char *status_string = NULL; switch (ctx->format_sel) { case NOTMUCH_FORMAT_TEXT: @@ -570,9 +571,17 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar notmuch_exit_if_unsupported_format (); - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx->notmuch)) + if (notmuch_database_open_verbose ( + notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx->notmuch, &status_string)) { + + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + return EXIT_FAILURE; + } query_str = query_string_from_args (ctx->notmuch, argc, argv); if (query_str == NULL) { |