From: David Bremner <brem...@debian.org>
Previously notmuch_restore_command returned 0 if tag_message returned
a non-zero (failure) value. This is wrong, since non-zero status
indicates something mysterious went wrong with retrieving the message,
or applying it.
There was also a failure to check or propagate the return value from
tag_op_list_apply in tag_message.
---
notmuch-restore.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/notmuch-restore.c b/notmuch-restore.c
index 40596a8..5a02328 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -25,6 +25,9 @@
static regex_t regex;
+/* Non-zero return indicates an error in retrieving the message,
+ * or in applying the tags.
+ */
static int
tag_message (unused (void *ctx),
notmuch_database_t *notmuch,
@@ -48,7 +51,7 @@ tag_message (unused (void *ctx),
/* In order to detect missing messages, this check/optimization is
* intentionally done *after* first finding the message. */
if ((flags & TAG_FLAG_REMOVE_ALL) || tag_op_list_size (tag_ops))
- tag_op_list_apply (message, tag_ops, flags);
+ ret = tag_op_list_apply (message, tag_ops, flags);
notmuch_message_destroy (message);
@@ -231,8 +234,12 @@ notmuch_restore_command (unused (void *ctx), int argc,
char *argv[])
if (ret > 0)
continue;
- if (ret < 0 || tag_message (ctx, notmuch, query_string,
- tag_ops, flags))
+ if (ret < 0)
+ break;
+
+ ret = tag_message (line_ctx, notmuch, query_string,
+ tag_ops, flags);
+ if (ret)
break;
} while ((line_len = getline (&line, &line_size, input)) != -1);
--
1.7.10.4
