#ifdef EXACT_ADDRESS
if (last && !last->val)
- last->val = mutt_substrdup (begin, s);
+ last->val = str_substrdup (begin, s);
#endif
commentlen = 0;
phraselen = 0;
last = cur;
#ifdef EXACT_ADDRESS
- last->val = mutt_substrdup (begin, s);
+ last->val = str_substrdup (begin, s);
#endif
phraselen = 0;
}
#ifdef EXACT_ADDRESS
if (last && !last->val)
- last->val = mutt_substrdup (begin, s);
+ last->val = str_substrdup (begin, s);
#endif
/* add group terminator */
}
#ifdef EXACT_ADDRESS
if (last)
- last->val = mutt_substrdup (begin, s);
+ last->val = str_substrdup (begin, s);
#endif
return top;
for (; addr; addr = addr->next)
if (!addr->group && addr->mailbox && strchr (addr->mailbox, '@') == NULL) {
- p = safe_malloc (mutt_strlen (addr->mailbox) + mutt_strlen (host) + 2);
+ p = safe_malloc (safe_strlen (addr->mailbox) + safe_strlen (host) + 2);
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
FREE (&addr->mailbox);
addr->mailbox = p;
if (!buflen)
goto done;
strfcpy (pbuf, addr->val, buflen);
- len = mutt_strlen (pbuf);
+ len = safe_strlen (pbuf);
pbuf += len;
buflen -= len;
if (addr->group) {
if (!buflen)
goto done;
strfcpy (pbuf, addr->personal, buflen);
- len = mutt_strlen (pbuf);
+ len = safe_strlen (pbuf);
pbuf += len;
buflen -= len;
}
goto done;
if (ascii_strcmp (addr->mailbox, "@") && !display) {
strfcpy (pbuf, addr->mailbox, buflen);
- len = mutt_strlen (pbuf);
+ len = safe_strlen (pbuf);
}
else if (ascii_strcmp (addr->mailbox, "@") && display) {
strfcpy (pbuf, mutt_addr_for_display (addr), buflen);
- len = mutt_strlen (pbuf);
+ len = safe_strlen (pbuf);
}
else {
*pbuf = '\0';
int display)
{
char *pbuf = buf;
- size_t len = mutt_strlen (buf);
+ size_t len = safe_strlen (buf);
buflen--; /* save room for the terminal nul */
/* 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 = mutt_strlen (pbuf);
+ len = safe_strlen (pbuf);
pbuf += len;
buflen -= len;