projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add m_strpad to the string functions.
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
6aad1d7
..
e40c937
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-499,7
+499,7
@@
static void addr_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
- rfc822_
write_address
(s, sizeof(s), *((address_t**) option->data), 0);
+ rfc822_
addrcat
(s, sizeof(s), *((address_t**) option->data), 0);
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
@@
-1034,7
+1034,7
@@
static int parse_attach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
len = m_strlen(a->minor);
tmpminor = p_new(char, len + 3);
len = m_strlen(a->minor);
tmpminor = p_new(char, len + 3);
- strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
+ m_strcpy(&tmpminor[1], len + 3, a->minor);
tmpminor[0] = '^';
tmpminor[len+1] = '$';
tmpminor[len+2] = '\0';
tmpminor[0] = '^';
tmpminor[len+1] = '$';
tmpminor[len+2] = '\0';
@@
-2302,8
+2302,7
@@
int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
- rfc822_write_address (tmp, sizeof(tmp),
- *((address_t **) option->data), 0);
+ rfc822_addrcat(tmp, sizeof(tmp), *((address_t **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
}
else if (DTYPE (option->type) == DT_QUAD)
m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
@@
-2406,7
+2405,7
@@
int mutt_query_variables (string_list_t * queries)
static int mutt_execute_commands (string_list_t * p)
{
BUFFER err, token;
static int mutt_execute_commands (string_list_t * p)
{
BUFFER err, token;
- char errstr[S
HORT_S
TRING];
+ char errstr[STRING];
p_clear(&err, 1);
err.data = errstr;
p_clear(&err, 1);
err.data = errstr;
@@
-2505,7
+2504,7
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
else
if (*buffer != '@') {
Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
else
if (*buffer != '@') {
Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
- sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer);
/* __SPRINTF_CHECKED__ */
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer);
}
else
Fqdn = m_strdup(NONULL (Hostname));
}
else
Fqdn = m_strdup(NONULL (Hostname));