diff options
| author |  David Bremner <bremner@debian.org> | 2012-12-16 16:04:21 -0400 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-12-22 23:11:47 -0400 |
| commit | 77b4ec70ecb9fdcbf9afd31f3663bd0135806bda (patch) | |
| tree | 77d8338f1aba320acbb3efb207b7bcf6d7ba05fd /notmuch-restore.c | |
| parent | 4af1ac604ed982d6e584c8d471a9f8fc404c4d8b (diff) | |
notmuch-restore: fix return value propagation
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.
Diffstat (limited to 'notmuch-restore.c')
| -rw-r--r-- | notmuch-restore.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/notmuch-restore.c b/notmuch-restore.c index 40596a80..28cbacf0 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 (ctx, notmuch, query_string, + tag_ops, flags); + if (ret) break; } while ((line_len = getline (&line, &line_size, input)) != -1); |