projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare documentation of the APIs
[apps/madmutt.git]
/
lib-ui
/
query.c
diff --git
a/lib-ui/query.c
b/lib-ui/query.c
index
62ecd9a
..
99631bf
100644
(file)
--- a/
lib-ui/query.c
+++ b/
lib-ui/query.c
@@
-76,7
+76,7
@@
static QUERY *run_query (char *s, int quiet)
int l;
int l;
- m
utt_expand_file_fmt
(cmd, sizeof (cmd), QueryCmd, s);
+ m
_quotefile_fmt
(cmd, sizeof (cmd), QueryCmd, s);
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
return 0;
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
return 0;
@@
-171,7
+171,7
@@
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
SecondColumn = QUERY_MIN_COLUMN_LENGHT;
}
SecondColumn = QUERY_MIN_COLUMN_LENGHT;
}
- rfc822_
write_address
(buf, sizeof (buf), table[num].data->addr, 1);
+ rfc822_
addrcat
(buf, sizeof (buf), table[num].data->addr, 1);
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
@@
-213,7
+213,7
@@
int mutt_query_complete (char *buf, ssize_t buflen)
tmpa = result_to_addr (results);
mutt_addrlist_to_local (tmpa);
buf[0] = '\0';
tmpa = result_to_addr (results);
mutt_addrlist_to_local (tmpa);
buf[0] = '\0';
- rfc822_
write_address
(buf, buflen, tmpa, 0);
+ rfc822_
addrcat
(buf, buflen, tmpa, 0);
address_list_wipe(&tmpa);
mutt_clear_error ();
return (0);
address_list_wipe(&tmpa);
mutt_clear_error ();
return (0);
@@
-426,7
+426,7
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
mutt_addrlist_to_local (tmpa);
tagged = 1;
mutt_addrlist_to_local (tmpa);
tagged = 1;
- rfc822_
write_address
(buf, buflen, tmpa, 0);
+ rfc822_
addrcat
(buf, buflen, tmpa, 0);
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
@@
-434,9
+434,8
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
address_t *tmpa = result_to_addr (QueryTable[i].data);
mutt_addrlist_to_local (tmpa);
address_t *tmpa = result_to_addr (QueryTable[i].data);
mutt_addrlist_to_local (tmpa);
- strcat (buf, ", "); /* __STRCAT_CHECKED__ */
- rfc822_write_address ((char *) buf + curpos + 1,
- buflen - curpos - 1, tmpa, 0);
+ m_strcat(buf, buflen, ", ");
+ rfc822_addrcat(buf + curpos + 1, buflen - curpos - 1, tmpa, 0);
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
@@
-447,7
+446,7
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
mutt_addrlist_to_local (tmpa);
address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
mutt_addrlist_to_local (tmpa);
- rfc822_
write_address
(buf, buflen, tmpa, 0);
+ rfc822_
addrcat
(buf, buflen, tmpa, 0);
address_list_wipe(&tmpa);
}
address_list_wipe(&tmpa);
}