const char *ps;
while (*s) {
- SKIPWS (s);
+ s = vskipspaces(s);
if (strchr (nonspecial, *s) == NULL && is_special (*s))
return s;
char token[STRING];
size_t tokenlen = 0;
- SKIPWS (s);
+ s = vskipspaces(s);
/* find the end of the route */
if (*s == '@') {
ws_pending = isspace ((unsigned char) *s);
- SKIPWS (s);
- begin = s;
+ begin = s = vskipspaces(s);
while (*s) {
if (*s == ',') {
if (phraselen) {
commentlen = 0;
phraselen = 0;
s++;
- begin = s;
- SKIPWS (begin);
+ begin = vskipspaces(s);
}
else if (*s == '(') {
if (commentlen && commentlen < sizeof (comment) - 1)
phraselen = 0;
commentlen = 0;
s++;
- begin = s;
- SKIPWS (begin);
+ begin = vskipspaces(s);
}
else if (*s == ';') {
if (phraselen) {
phraselen = 0;
commentlen = 0;
s++;
- begin = s;
- SKIPWS (begin);
+ begin = vskipspaces(s);
}
else if (*s == '<') {
terminate_buffer (phrase, phraselen);
s = ps;
}
ws_pending = isspace ((unsigned char) *s);
- SKIPWS (s);
+ s = vskipspaces(s);
}
if (phraselen) {
}
*pc++ = '"';
*pc = 0;
- strfcpy (buf, tmp, buflen);
+ m_strcpy(buf, buflen, tmp);
}
else
- strfcpy (buf, value, buflen);
+ m_strcpy(buf, buflen, value);
}
void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
else {
if (!buflen)
goto done;
- strfcpy (pbuf, addr->personal, buflen);
+ m_strcpy(pbuf, buflen, addr->personal);
len = m_strlen(pbuf);
pbuf += len;
buflen -= len;
if (!buflen)
goto done;
if (ascii_strcmp (addr->mailbox, "@") && !display) {
- strfcpy (pbuf, addr->mailbox, buflen);
+ m_strcpy(pbuf, buflen, addr->mailbox);
len = m_strlen(pbuf);
}
else if (ascii_strcmp (addr->mailbox, "@") && display) {
- strfcpy (pbuf, mutt_addr_for_display (addr), buflen);
+ m_strcpy(pbuf, buflen, mutt_addr_for_display(addr));
len = m_strlen(pbuf);
}
else {