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

Make reply/show/tag all require at least one search term

Browse source 
In particular, notmuch tag -inbox "" tended to take a long time to
run, happened if you hit 'a' on a blank line in the search view and
probably didn't have the desired effect.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2009-11-18 13:43:38 -08:00 committed by Carl Worth
parent 956917915f
commit 394cb1c46d
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
notmuch-reply.c
View file

@ -196,16 +196,21 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
if (config == NULL) if (config == NULL)
return 1; return 1;
notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
if (notmuch == NULL)
return 1;
query_string = query_string_from_args (ctx, argc, argv); query_string = query_string_from_args (ctx, argc, argv);
if (query_string == NULL) { if (query_string == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");
return 1; return 1;
} }
if (*query_string == '\0') {
fprintf (stderr, "Error: notmuch reply requires at least one search term.\n");
return 1;
}
notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
if (notmuch == NULL)
return 1;
query = notmuch_query_create (notmuch, query_string); query = notmuch_query_create (notmuch, query_string);
if (query == NULL) { if (query == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");

13
notmuch-show.c
View file

@ -196,16 +196,21 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
if (config == NULL) if (config == NULL)
return 1; return 1;
notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
if (notmuch == NULL)
return 1;
query_string = query_string_from_args (ctx, argc, argv); query_string = query_string_from_args (ctx, argc, argv);
if (query_string == NULL) { if (query_string == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");
return 1; return 1;
} }
if (*query_string == '\0') {
fprintf (stderr, "Error: notmuch show requires at least one search term.\n");
return 1;
}
notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
if (notmuch == NULL)
return 1;
query = notmuch_query_create (notmuch, query_string); query = notmuch_query_create (notmuch, query_string);
if (query == NULL) { if (query == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");

8
notmuch-tag.c
View file

@ -83,8 +83,10 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
return 1; return 1;
} }
if (i == argc) { query_string = query_string_from_args (ctx, argc - i, &argv[i]);
fprintf (stderr, "Error: 'notmuch tag' requires at least one search term.\n");
if (*query_string == '\0') {
fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
return 1; return 1;
} }
@ -96,8 +98,6 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
if (notmuch == NULL) if (notmuch == NULL)
return 1; return 1;
query_string = query_string_from_args (ctx, argc - i, &argv[i]);
query = notmuch_query_create (notmuch, query_string); query = notmuch_query_create (notmuch, query_string);
if (query == NULL) { if (query == NULL) {
fprintf (stderr, "Out of memory.\n"); fprintf (stderr, "Out of memory.\n");