On Fri, 14 Dec 2012, david at tethera.net wrote: > From: Jani Nikula <jani at nikula.org> > > Add support for batch tagging operations through stdin to "notmuch > tag". This can be enabled with the new --batch command line option to > "notmuch tag". The input must consist of lines of the format: > > +<tag>|-<tag> [...] [--] <search-term> [...] > > Each line is interpreted similarly to "notmuch tag" command line > arguments. The delimiter is one or more spaces ' '. Any characters in > <tag> and <search-term> MAY be hex encoded with %NN where NN is the > hexadecimal value of the character. Any ' ' and '%' characters in > <tag> and <search-term> MUST be hex encoded (using %20 and %25, > respectively). Any characters that are not part of <tag> or > <search-term> MUST NOT be hex encoded. > > Leading and trailing space ' ' is ignored. Empty lines and lines > beginning with '#' are ignored. > > Signed-off-by: Jani Nikula <jani at nikula.org> > > Hacked-like-crazy-by: David Bremner <david at tethera.net> > --- > notmuch-tag.c | 88 > +++++++++++++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 80 insertions(+), 8 deletions(-) > > diff --git a/notmuch-tag.c b/notmuch-tag.c > index 13f2268..a81d911 100644 > --- a/notmuch-tag.c > +++ b/notmuch-tag.c > @@ -130,6 +130,43 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const > char *query_string, > return interrupted; > } > > +static int > +tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags, > + FILE *input) > +{ > + char *line = NULL; > + char *query_string = NULL; > + size_t line_size = 0; > + ssize_t line_len; > + int ret = 0; > + tag_op_list_t *tag_ops; > + > + tag_ops = tag_op_list_create (ctx); > + if (tag_ops == NULL) { > + fprintf (stderr, "Out of memory.\n"); > + return 1; > + } > + > + while ((line_len = getline (&line, &line_size, input)) != -1 && > + ! interrupted) { > + > + ret = parse_tag_line (ctx, line, TAG_FLAG_NONE, > + &query_string, tag_ops); > + > + if (ret > 0) > + continue; > + > + if (ret < 0 || tag_query (ctx, notmuch, query_string, > + tag_ops, flags)) > + break;
Hey, your changelog in the cover letter says you fixed the tag_query return value propagation, but it's not here? BR, Jani. > + } > + > + if (line) > + free (line); > + > + return ret; > +} > + > int > notmuch_tag_command (void *ctx, int argc, char *argv[]) > { > @@ -139,6 +176,10 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) > notmuch_database_t *notmuch; > struct sigaction action; > tag_op_flag_t tag_flags = TAG_FLAG_NONE; > + notmuch_bool_t batch = FALSE; > + FILE *input = stdin; > + char *input_file_name = NULL; > + int opt_index; > int ret = 0; > > /* Setup our handler for SIGINT */ > @@ -148,15 +189,43 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) > action.sa_flags = SA_RESTART; > sigaction (SIGINT, &action, NULL); > > - tag_ops = tag_op_list_create (ctx); > - if (tag_ops == NULL) { > - fprintf (stderr, "Out of memory.\n"); > + notmuch_opt_desc_t options[] = { > + { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 }, > + { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, > + { 0, 0, 0, 0, 0 } > + }; > + > + opt_index = parse_arguments (argc, argv, options, 1); > + if (opt_index < 0) > return 1; > + > + if (input_file_name) { > + batch = TRUE; > + input = fopen (input_file_name, "r"); > + if (input == NULL) { > + fprintf (stderr, "Error opening %s for reading: %s\n", > + input_file_name, strerror (errno)); > + return 1; > + } > } > > - if (parse_tag_command_line (ctx, argc - 1, argv + 1, > - &query_string, tag_ops)) > - return 1; > + if (batch) { > + if (opt_index != argc) { > + fprintf (stderr, "Can't specify both cmdline and stdin!\n"); > + return 1; > + } > + } else { > + > + tag_ops = tag_op_list_create (ctx); > + if (tag_ops == NULL) { > + fprintf (stderr, "Out of memory.\n"); > + return 1; > + } > + > + if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index, > + &query_string, tag_ops)) > + return 1; > + } > > config = notmuch_config_open (ctx, NULL, NULL); > if (config == NULL) > @@ -169,9 +238,12 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) > if (notmuch_config_get_maildir_synchronize_flags (config)) > tag_flags |= TAG_FLAG_MAILDIR_SYNC; > > - ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags); > + if (batch) > + ret = tag_file (ctx, notmuch, tag_flags, input); > + else > + ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags); > > notmuch_database_destroy (notmuch); > > - return ret; > + return ret || interrupted; > } > -- > 1.7.10.4