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

notmuch-restore: fix return value propagation

Browse source 
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.
This commit is contained in:
David Bremner 2012-12-16 16:04:21 -04:00
parent 4af1ac604e
commit 77b4ec70ec
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
notmuch-restore.c
View file

@ -25,6 +25,9 @@
static regex_t regex; static regex_t regex;
/* Non-zero return indicates an error in retrieving the message,
* or in applying the tags.
*/
static int static int
tag_message (unused (void *ctx), tag_message (unused (void *ctx),
notmuch_database_t *notmuch, notmuch_database_t *notmuch,
@ -48,7 +51,7 @@ tag_message (unused (void *ctx),
/* In order to detect missing messages, this check/optimization is /* In order to detect missing messages, this check/optimization is
* intentionally done *after* first finding the message. */ * intentionally done *after* first finding the message. */
if ((flags & TAG_FLAG_REMOVE_ALL) || tag_op_list_size (tag_ops)) 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); notmuch_message_destroy (message);
@ -231,8 +234,12 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if (ret > 0) if (ret > 0)
continue; continue;
if (ret < 0 || tag_message (ctx, notmuch, query_string, if (ret < 0)
tag_ops, flags)) break;
ret = tag_message (ctx, notmuch, query_string,
tag_ops, flags);
if (ret)
break; break;
} while ((line_len = getline (&line, &line_size, input)) != -1); } while ((line_len = getline (&line, &line_size, input)) != -1);