notmuch_query_t *query;
notmuch_messages_t *messages;
notmuch_message_t *message;
+ int ret = NOTMUCH_STATUS_SUCCESS;
/* Optimize the query so it excludes messages that already have
* the specified set of tags. */
notmuch_messages_valid (messages) && ! interrupted;
notmuch_messages_move_to_next (messages)) {
message = notmuch_messages_get (messages);
- tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
+ ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
notmuch_message_destroy (message);
+ if (ret != NOTMUCH_STATUS_SUCCESS)
+ break;
}
notmuch_query_destroy (query);
- return interrupted;
+ return ret || interrupted;
}
static int
size_t line_size = 0;
ssize_t line_len;
int ret = 0;
+ int warn = 0;
tag_op_list_t *tag_ops;
tag_ops = tag_op_list_create (ctx);
ret = parse_tag_line (ctx, line, TAG_FLAG_NONE,
&query_string, tag_ops);
- if (ret > 0)
+ if (ret > 0) {
+ if (ret != TAG_PARSE_SKIPPED)
+ /* remember there has been problematic lines */
+ warn = 1;
+ ret = 0;
continue;
+ }
if (ret < 0)
break;
if (line)
free (line);
- return ret;
+ return ret || warn;
}
int