projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
query.c
diff --git
a/query.c
b/query.c
index
c3e948d
..
35dbf2b
100644
(file)
--- a/
query.c
+++ b/
query.c
@@
-20,6
+20,7
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
@@
-85,7
+86,7
@@
static QUERY *run_query (char *s, int quiet)
mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
- d
print (1, (debugfile, "unable to fork command: %s
", cmd));
+ d
ebug_print (1, ("unable to fork command: %s\n
", cmd));
return 0;
}
if (!quiet)
return 0;
}
if (!quiet)
@@
-128,7
+129,7
@@
static QUERY *run_query (char *s, int quiet)
FREE (&buf);
fclose (fp);
if (mutt_wait_filter (thepid)) {
FREE (&buf);
fclose (fp);
if (mutt_wait_filter (thepid)) {
- d
print (1, (debugfile,
"Error: %s\n", msg));
+ d
ebug_print (1, (
"Error: %s\n", msg));
if (!quiet)
mutt_error ("%s", msg);
}
if (!quiet)
mutt_error ("%s", msg);
}
@@
-155,11
+156,6
@@
static int query_search (MUTTMENU * m, regex_t * re, int n)
if (table[n].data->addr->mailbox &&
!regexec (re, table[n].data->addr->mailbox, 0, NULL, 0))
return 0;
if (table[n].data->addr->mailbox &&
!regexec (re, table[n].data->addr->mailbox, 0, NULL, 0))
return 0;
-#ifdef EXACT_ADDRESS
- if (table[n].data->addr->val &&
- !regexec (re, table[n].data->addr->val, 0, NULL, 0))
- return 0;
-#endif
}
return REG_NOMATCH;
}
return REG_NOMATCH;