projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
query.c
diff --git
a/query.c
b/query.c
index
77bd99a
..
5c5d0a3
100644
(file)
--- a/
query.c
+++ b/
query.c
@@
-17,6
+17,11
@@
#include "mapping.h"
#include "sort.h"
#include "mapping.h"
#include "sort.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
@@
-81,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)
@@
-124,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);
}
@@
-151,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;
@@
-185,7
+185,7
@@
static void query_entry (char *s, size_t slen, MUTTMENU * m, int num)
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
0, ' ', table[num].data->name,
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
0, ' ', table[num].data->name,
-
mutt
_strlen (table[num].data->name), 0);
+
safe
_strlen (table[num].data->name), 0);
snprintf (s, slen, " %c %3d %s %-*.*s %s",
table[num].tagged ? '*' : ' ',
snprintf (s, slen, " %c %3d %s %-*.*s %s",
table[num].tagged ? '*' : ' ',
@@
-444,7
+444,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
mutt_addrlist_to_local (tmpa);
tagged = 1;
rfc822_write_address (buf, buflen, tmpa, 0);
mutt_addrlist_to_local (tmpa);
tagged = 1;
rfc822_write_address (buf, buflen, tmpa, 0);
- curpos =
mutt
_strlen (buf);
+ curpos =
safe
_strlen (buf);
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
@@
-454,7
+454,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
strcat (buf, ", "); /* __STRCAT_CHECKED__ */
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
strcat (buf, ", "); /* __STRCAT_CHECKED__ */
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
- curpos =
mutt
_strlen (buf);
+ curpos =
safe
_strlen (buf);
rfc822_free_address (&tmpa);
}
}
rfc822_free_address (&tmpa);
}
}