From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH 1/3] notmuch-restore: fix return value propagation
Date: Sun, 16 Dec 2012 23:59:46 -0400 [thread overview]
Message-ID: <1355716788-2940-2-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1355716788-2940-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@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
next prev parent reply other threads:[~2012-12-17 4:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 3:59 v2 restore leak fix david
2012-12-17 3:59 ` david [this message]
2012-12-17 3:59 ` [PATCH 2/3] tag-utils: use the tag_opt_list_t as talloc context, if possible david
2012-12-17 16:24 ` Tomi Ollila
2012-12-17 3:59 ` [PATCH 3/3] notmuch-restore: allocate a temporary talloc context for each line parsed david
2012-12-22 21:38 ` v2 restore leak fix Jani Nikula
2012-12-23 3:34 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355716788-2940-2-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).