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

cli: make caller check tag count in parse_tag_command_line

Browse source
This commit is contained in:
Jani Nikula 2013-03-09 16:56:48 +02:00 committed by David Bremner
parent 703136c57b
commit a6822eccac
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
notmuch-tag.c
View file

@ -233,6 +233,11 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
if (parse_tag_command_line (config, argc - opt_index, argv + opt_index, if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
&query_string, tag_ops)) &query_string, tag_ops))
return 1; 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 (notmuch_database_open (notmuch_config_get_database_path (config), if (notmuch_database_open (notmuch_config_get_database_path (config),

5
tag-util.c
View file

@ -188,11 +188,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
tag_op_list_append (tag_ops, argv[i] + 1, is_remove); 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]); *query_str = query_string_from_args (ctx, argc - i, &argv[i]);
if (*query_str == NULL || **query_str == '\0') { if (*query_str == NULL || **query_str == '\0') {