debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-27 21:27:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tag-util: factor out rules for illegal tags, use in parse_tag_line

Browse source 
This will allow us to be consistent between batch tagging and command
line tagging as far as what is an illegal tag.
This commit is contained in:
David Bremner 2012-12-25 15:42:38 -04:00
parent 18d79d1973
commit e13e259147
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tag-util.c
View file

@ -31,6 +31,30 @@ line_error (tag_parse_status_t status,
return status; return status;
} }
/*
* Test tags for some forbidden cases.
*
* return: NULL if OK,
* explanatory message otherwise.
*/
static const char *
illegal_tag (const char *tag, notmuch_bool_t remove)
{
if (*tag == '\0' && ! remove)
return "empty tag forbidden";
/* This disallows adding the non-removable tag "-" and
* enables notmuch tag to take long options more easily.
*/
if (*tag == '-' && ! remove)
return "tag starting with '-' forbidden";
return NULL;
}
tag_parse_status_t tag_parse_status_t
parse_tag_line (void *ctx, char *line, parse_tag_line (void *ctx, char *line,
tag_op_flag_t flags, tag_op_flag_t flags,
@ -95,12 +119,14 @@ parse_tag_line (void *ctx, char *line,
remove = (*tok == '-'); remove = (*tok == '-');
tag = tok + 1; tag = tok + 1;
/* Maybe refuse empty tags. */ /* Maybe refuse illegal tags. */
if (! (flags & TAG_FLAG_BE_GENEROUS) && *tag == '\0') { if (! (flags & TAG_FLAG_BE_GENEROUS)) {
ret = line_error (TAG_PARSE_INVALID, line_for_error, const char *msg = illegal_tag (tag, remove);
"empty tag"); if (msg) {
ret = line_error (TAG_PARSE_INVALID, line_for_error, msg);
goto DONE; goto DONE;
} }
}
/* Decode tag. */ /* Decode tag. */
if (hex_decode_inplace (tag) != HEX_SUCCESS) { if (hex_decode_inplace (tag) != HEX_SUCCESS) {