projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix esmtp.
[apps/madmutt.git]
/
lib-ui
/
query.c
diff --git
a/lib-ui/query.c
b/lib-ui/query.c
index
b0a42d7
..
d1933f8
100644
(file)
--- a/
lib-ui/query.c
+++ b/
lib-ui/query.c
@@
-100,14
+100,14
@@
static QUERY *run_query (char *s, int quiet)
cur = cur->next;
}
cur = cur->next;
}
- l = m
utt_strwidth
(p);
+ l = m
_strwidth
(p);
if (l > SecondColumn)
SecondColumn = l;
cur->addr = rfc822_parse_adrlist (cur->addr, p);
p = strtok (NULL, "\t\n");
if (p) {
if (l > SecondColumn)
SecondColumn = l;
cur->addr = rfc822_parse_adrlist (cur->addr, p);
p = strtok (NULL, "\t\n");
if (p) {
- l = m
utt_strwidth
(p);
+ l = m
_strwidth
(p);
if (l > FirstColumn)
FirstColumn = l;
cur->name = m_strdup(p);
if (l > FirstColumn)
FirstColumn = l;
cur->name = m_strdup(p);
@@
-159,7
+159,7
@@
static int query_search (MUTTMENU * m, regex_t * re, int n)
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
ENTRY *table = (ENTRY *) m->data;
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
ENTRY *table = (ENTRY *) m->data;
- char buf2[S
HORT_STRING], buf[SHORT_
STRING] = "";
+ char buf2[S
TRING], buf[
STRING] = "";
/* need a query format ... hard coded constants are not good */
while (FirstColumn + SecondColumn > 70) {
/* need a query format ... hard coded constants are not good */
while (FirstColumn + SecondColumn > 70) {
@@
-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);
@@
-250,7
+250,7
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
QUERY *queryp = NULL;
int i, done = 0;
int op;
QUERY *queryp = NULL;
int i, done = 0;
int op;
- char helpstr[S
HORT_S
TRING];
+ char helpstr[STRING];
char title[STRING];
snprintf (title, sizeof (title), _("Query")); /* FIXME */
char title[STRING];
snprintf (title, sizeof (title), _("Query")); /* FIXME */
@@
-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);
}