#include <ctype.h>
#include <stdlib.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#define terminate_string(a, b, c) do { if ((b) < (c)) a[(b)] = 0; else \
a[(c)] = 0; } while (0)
while (*p) {
t = *p;
*p = (*p)->next;
-#ifdef EXACT_ADDRESS
- FREE (&t->val);
-#endif
- FREE (&t->personal);
- FREE (&t->mailbox);
- FREE (&t);
+ p_delete(&t->personal);
+ p_delete(&t->mailbox);
+ p_delete(&t);
}
}
const char *ps;
while (*s) {
- SKIPWS (s);
+ s = vskipspaces(s);
if (strchr (nonspecial, *s) == NULL && is_special (*s))
return s;
}
terminate_string (token, *tokenlen, tokenmax);
- addr->mailbox = safe_strdup (token);
+ addr->mailbox = m_strdup(token);
if (*commentlen && !addr->personal) {
terminate_string (comment, *commentlen, commentmax);
- addr->personal = safe_strdup (comment);
+ addr->personal = m_strdup(comment);
}
return s;
char token[STRING];
size_t tokenlen = 0;
- SKIPWS (s);
+ s = vskipspaces(s);
/* find the end of the route */
if (*s == '@') {
}
if (!addr->mailbox)
- addr->mailbox = safe_strdup ("@");
+ addr->mailbox = m_strdup("@");
s++;
return s;
ws_pending = isspace ((unsigned char) *s);
- SKIPWS (s);
- begin = s;
+ begin = s = vskipspaces(s);
while (*s) {
if (*s == ',') {
if (phraselen) {
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
- last->personal = safe_strdup (comment);
+ last->personal = m_strdup(comment);
}
-#ifdef EXACT_ADDRESS
- if (last && !last->val)
- last->val = str_substrdup (begin, s);
-#endif
commentlen = 0;
phraselen = 0;
s++;
- begin = s;
- SKIPWS (begin);
+ begin = vskipspaces(s);
}
else if (*s == '(') {
if (commentlen && commentlen < sizeof (comment) - 1)
else if (*s == ':') {
cur = rfc822_new_address ();
terminate_buffer (phrase, phraselen);
- cur->mailbox = safe_strdup (phrase);
+ cur->mailbox = m_strdup(phrase);
cur->group = 1;
if (last)
top = cur;
last = cur;
-#ifdef EXACT_ADDRESS
- last->val = str_substrdup (begin, s);
-#endif
-
phraselen = 0;
commentlen = 0;
s++;
- begin = s;
- SKIPWS (begin);
+ begin = vskipspaces(s);
}
else if (*s == ';') {
if (phraselen) {
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
- last->personal = safe_strdup (comment);
+ last->personal = m_strdup(comment);
}
-#ifdef EXACT_ADDRESS
- if (last && !last->val)
- last->val = str_substrdup (begin, s);
-#endif
/* add group terminator */
cur = rfc822_new_address ();
phraselen = 0;
commentlen = 0;
s++;
- begin = s;
- SKIPWS (begin);
+ begin = vskipspaces(s);
}
else if (*s == '<') {
terminate_buffer (phrase, phraselen);
cur = rfc822_new_address ();
if (phraselen) {
if (cur->personal)
- FREE (&cur->personal);
+ p_delete(&cur->personal);
/* if we get something like "Michael R. Elkins" remove the quotes */
rfc822_dequote_comment (phrase);
- cur->personal = safe_strdup (phrase);
+ cur->personal = m_strdup(phrase);
}
if ((ps =
parse_route_addr (s + 1, comment, &commentlen,
s = ps;
}
ws_pending = isspace ((unsigned char) *s);
- SKIPWS (s);
+ s = vskipspaces(s);
}
if (phraselen) {
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
- last->personal = safe_strdup (comment);
+ last->personal = m_strdup(comment);
}
-#ifdef EXACT_ADDRESS
- if (last)
- 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 (safe_strlen (addr->mailbox) + safe_strlen (host) + 2);
+ p = p_new(char, m_strlen(addr->mailbox) + m_strlen(host) + 2);
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
- FREE (&addr->mailbox);
+ p_delete(&addr->mailbox);
addr->mailbox = p;
}
}
}
*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,
buflen--; /* save room for the terminal nul */
-#ifdef EXACT_ADDRESS
- if (addr->val) {
- if (!buflen)
- goto done;
- strfcpy (pbuf, addr->val, buflen);
- len = safe_strlen (pbuf);
- pbuf += len;
- buflen -= len;
- if (addr->group) {
- if (!buflen)
- goto done;
- *pbuf++ = ':';
- buflen--;
- *pbuf = 0;
- }
- return;
- }
-#endif
-
if (addr->personal) {
if (strpbrk (addr->personal, RFC822Specials)) {
if (!buflen)
else {
if (!buflen)
goto done;
- strfcpy (pbuf, addr->personal, buflen);
- len = safe_strlen (pbuf);
+ 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);
- len = safe_strlen (pbuf);
+ 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);
- len = safe_strlen (pbuf);
+ m_strcpy(pbuf, buflen, mutt_addr_for_display(addr));
+ len = m_strlen(pbuf);
}
else {
*pbuf = '\0';
int display)
{
char *pbuf = buf;
- size_t len = safe_strlen (buf);
+ size_t len = m_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 = safe_strlen (pbuf);
+ len = m_strlen(pbuf);
pbuf += len;
buflen -= len;
{
ADDRESS *p = rfc822_new_address ();
-#ifdef EXACT_ADDRESS
- p->val = safe_strdup (addr->val);
-#endif
- p->personal = safe_strdup (addr->personal);
- p->mailbox = safe_strdup (addr->mailbox);
+ p->personal = m_strdup(addr->personal);
+ p->mailbox = m_strdup(addr->mailbox);
p->group = addr->group;
return p;
}