From: Jani Nikula <jani@nikula.org>
To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH v3 08/20] tag-util: move out 'tag' command-line checks
Date: Mon, 21 Jan 2013 19:05:00 +0100 [thread overview]
Message-ID: <87boci2z03.fsf@nikula.org> (raw)
In-Reply-To: <1358643004-14522-9-git-send-email-novalazy@gmail.com>
On Sun, 20 Jan 2013, Peter Wang <novalazy@gmail.com> wrote:
> parse_tag_command_line checked for two error conditions which are
> specific to the 'tag' command. It can be reused for the notmuch
> 'insert' command if we move the checks out, into notmuch-tag.c.
*three* error conditions, two of which are specific to notmuch tag. See
below.
> ---
> notmuch-tag.c | 10 ++++++++++
> tag-util.c | 10 ----------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/notmuch-tag.c b/notmuch-tag.c
> index d9daf8f..a901dad 100644
> --- a/notmuch-tag.c
> +++ b/notmuch-tag.c
> @@ -234,6 +234,16 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
> if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index,
> &query_string, tag_ops))
> return 1;
> +
> + if (tag_op_list_size (tag_ops) == 0) {
> + fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
> + return 1;
> + }
> +
> + if (*query_string == '\0') {
> + fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
> + return 1;
> + }
> }
>
> config = notmuch_config_open (ctx, NULL, NULL);
> diff --git a/tag-util.c b/tag-util.c
> index 3f9da05..41f2c09 100644
> --- a/tag-util.c
> +++ b/tag-util.c
> @@ -186,18 +186,8 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
> tag_op_list_append (tag_ops, argv[i] + 1, is_remove);
> }
>
> - if (tag_op_list_size (tag_ops) == 0) {
> - fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
> - return TAG_PARSE_INVALID;
> - }
> -
> *query_str = query_string_from_args (ctx, argc - i, &argv[i]);
>
> - if (*query_str == NULL || **query_str == '\0') {
You must leave *query_str == NULL check intact here. Fix the error
message to be about allocation failure and drop the reference to notmuch
tag while at it.
Otherwise LGTM.
> - fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
> - return TAG_PARSE_INVALID;
> - }
> -
> return TAG_PARSE_SUCCESS;
> }
>
> --
> 1.7.12.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2013-01-21 18:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 0:49 [PATCH v3 00/20] insert command Peter Wang
2013-01-20 0:49 ` [PATCH v3 01/20] cli: add stub for " Peter Wang
2013-01-22 21:45 ` Jani Nikula
2013-01-23 8:04 ` Peter Wang
2013-01-23 8:26 ` Tomi Ollila
2013-01-23 9:22 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 02/20] insert: open Maildir tmp file Peter Wang
2013-01-20 0:49 ` [PATCH v3 03/20] insert: copy stdin to " Peter Wang
2013-01-20 0:49 ` [PATCH v3 04/20] insert: move file from Maildir tmp to new Peter Wang
2013-01-20 0:49 ` [PATCH v3 05/20] insert: add new message to database Peter Wang
2013-01-20 0:49 ` [PATCH v3 06/20] insert: apply default tags to new message Peter Wang
2013-01-20 0:49 ` [PATCH v3 07/20] tag-util: do not reset list in parse_tag_command_line Peter Wang
2013-01-21 18:09 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 08/20] tag-util: move out 'tag' command-line checks Peter Wang
2013-01-21 18:05 ` Jani Nikula [this message]
2013-01-20 0:49 ` [PATCH v3 09/20] insert: parse and apply command-line tag operations Peter Wang
2013-01-20 0:49 ` [PATCH v3 10/20] insert: support --folder option Peter Wang
2013-01-20 0:49 ` [PATCH v3 11/20] insert: prevent writes outside Maildir hierarchy Peter Wang
2013-01-20 0:49 ` [PATCH v3 12/20] insert: add --create-folder option Peter Wang
2013-01-20 0:49 ` [PATCH v3 13/20] insert: fsync after writing tmp file Peter Wang
2013-01-20 0:49 ` [PATCH v3 14/20] insert: fsync new directory after rename Peter Wang
2013-01-20 0:49 ` [PATCH v3 15/20] insert: fsync parent directory after mkdir Peter Wang
2013-01-20 0:50 ` [PATCH v3 16/20] insert: trap SIGINT and clean up Peter Wang
2013-01-20 0:50 ` [PATCH v3 17/20] insert: add copyright line from notmuch-deliver Peter Wang
2013-01-20 0:50 ` [PATCH v3 18/20] man: document 'insert' command Peter Wang
2013-01-20 0:50 ` [PATCH v3 19/20] man: reference notmuch-insert.1 Peter Wang
2013-01-20 0:50 ` [PATCH v3 20/20] test: add tests for insert Peter Wang
2013-01-22 20:05 ` [PATCH v3 00/20] insert command Jani Nikula
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=87boci2z03.fsf@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=novalazy@gmail.com \
/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).