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]
/
rfc822.c
diff --git
a/rfc822.c
b/rfc822.c
index
64b1606
..
19fb086
100644
(file)
--- a/
rfc822.c
+++ b/
rfc822.c
@@
-446,7
+446,7
@@
void rfc822_qualify (ADDRESS * addr, const char *host)
for (; addr; addr = addr->next)
if (!addr->group && addr->mailbox && strchr (addr->mailbox, '@') == NULL) {
for (; addr; addr = addr->next)
if (!addr->group && addr->mailbox && strchr (addr->mailbox, '@') == NULL) {
- p = safe_malloc (
safe_strlen (addr->mailbox) + safe
_strlen (host) + 2);
+ p = safe_malloc (
mutt_strlen (addr->mailbox) + mutt
_strlen (host) + 2);
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
FREE (&addr->mailbox);
addr->mailbox = p;
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
FREE (&addr->mailbox);
addr->mailbox = p;
@@
-516,7
+516,7
@@
void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
if (!buflen)
goto done;
strfcpy (pbuf, addr->personal, buflen);
if (!buflen)
goto done;
strfcpy (pbuf, addr->personal, buflen);
- len =
safe
_strlen (pbuf);
+ len =
mutt
_strlen (pbuf);
pbuf += len;
buflen -= len;
}
pbuf += len;
buflen -= len;
}
@@
-539,11
+539,11
@@
void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
goto done;
if (ascii_strcmp (addr->mailbox, "@") && !display) {
strfcpy (pbuf, addr->mailbox, buflen);
goto done;
if (ascii_strcmp (addr->mailbox, "@") && !display) {
strfcpy (pbuf, addr->mailbox, buflen);
- len =
safe
_strlen (pbuf);
+ len =
mutt
_strlen (pbuf);
}
else if (ascii_strcmp (addr->mailbox, "@") && display) {
strfcpy (pbuf, mutt_addr_for_display (addr), buflen);
}
else if (ascii_strcmp (addr->mailbox, "@") && display) {
strfcpy (pbuf, mutt_addr_for_display (addr), buflen);
- len =
safe
_strlen (pbuf);
+ len =
mutt
_strlen (pbuf);
}
else {
*pbuf = '\0';
}
else {
*pbuf = '\0';
@@
-587,7
+587,7
@@
void rfc822_write_address (char *buf, size_t buflen, ADDRESS * addr,
int display)
{
char *pbuf = buf;
int display)
{
char *pbuf = buf;
- size_t len =
safe
_strlen (buf);
+ size_t len =
mutt
_strlen (buf);
buflen--; /* save room for the terminal nul */
buflen--; /* save room for the terminal nul */
@@
-614,7
+614,7
@@
void rfc822_write_address (char *buf, size_t buflen, ADDRESS * addr,
/* this should be safe since we always have at least 1 char passed into
the above call, which means `pbuf' should always be nul terminated */
/* this should be safe since we always have at least 1 char passed into
the above call, which means `pbuf' should always be nul terminated */
- len =
safe
_strlen (pbuf);
+ len =
mutt
_strlen (pbuf);
pbuf += len;
buflen -= len;
pbuf += len;
buflen -= len;