static void
handle_sigint (unused (int sig))
{
+ ssize_t ignored;
+
static char msg[] = "Stopping... \n";
- write(2, msg, sizeof(msg)-1);
+ ignored = write(2, msg, sizeof(msg)-1);
interrupted = 1;
}
return 1;
}
- if (i == argc) {
- fprintf (stderr, "Error: 'notmuch tag' requires at least one search term.\n");
+ query_string = query_string_from_args (ctx, argc - i, &argv[i]);
+
+ if (*query_string == '\0') {
+ fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
return 1;
}
if (config == NULL)
return 1;
- notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
+ notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+ NOTMUCH_DATABASE_MODE_READ_WRITE);
if (notmuch == NULL)
return 1;
- query_string = query_string_from_args (ctx, argc - i, &argv[i]);
-
query = notmuch_query_create (notmuch, query_string);
if (query == NULL) {
fprintf (stderr, "Out of memory.\n");
return 1;
}
- for (messages = notmuch_query_search_messages (query, 0, -1);
- notmuch_messages_has_more (messages) && !interrupted;
- notmuch_messages_advance (messages))
+ for (messages = notmuch_query_search_messages (query);
+ notmuch_messages_valid (messages) && !interrupted;
+ notmuch_messages_move_to_next (messages))
{
message = notmuch_messages_get (messages);