X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc822.c;h=5dc33e2bb1b358622c2d15f61b1e1d5a3aca2ce2;hp=10758531c4d8927e11c5c9f508af203fdbb1cef9;hb=c6b020e0fa5c38e4fd8a6ffb75e00338c0535b11;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/rfc822.c b/rfc822.c index 1075853..5dc33e2 100644 --- a/rfc822.c +++ b/rfc822.c @@ -15,19 +15,8 @@ #include #include -#ifndef TESTING #include "mutt.h" -#else -#define safe_strdup strdup -#define safe_malloc malloc -#define SKIPWS(x) while(isspace(*x))x++ -#define FREE(x) safe_free(x) -#define ISSPACE isspace -#define strfcpy(a,b,c) {if (c) {strncpy(a,b,c);a[c-1]=0;}} -#define STRING 128 -#include "rfc822.h" -#endif - +#include "ascii.h" #include "mutt_idna.h" #include "lib/mem.h" @@ -82,12 +71,9 @@ void rfc822_free_address (ADDRESS ** p) while (*p) { t = *p; *p = (*p)->next; -#ifdef EXACT_ADDRESS - FREE (&t->val); -#endif - FREE (&t->personal); - FREE (&t->mailbox); - FREE (&t); + mem_free (&t->personal); + mem_free (&t->mailbox); + mem_free (&t); } } @@ -220,11 +206,11 @@ static const char *parse_address (const char *s, } terminate_string (token, *tokenlen, tokenmax); - addr->mailbox = safe_strdup (token); + addr->mailbox = str_dup (token); if (*commentlen && !addr->personal) { terminate_string (comment, *commentlen, commentmax); - addr->personal = safe_strdup (comment); + addr->personal = str_dup (comment); } return s; @@ -269,7 +255,7 @@ static const char *parse_route_addr (const char *s, } if (!addr->mailbox) - addr->mailbox = safe_strdup ("@"); + addr->mailbox = str_dup ("@"); s++; return s; @@ -337,13 +323,9 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) } else if (commentlen && last && !last->personal) { terminate_buffer (comment, commentlen); - last->personal = safe_strdup (comment); + last->personal = str_dup (comment); } -#ifdef EXACT_ADDRESS - if (last && !last->val) - last->val = mutt_substrdup (begin, s); -#endif commentlen = 0; phraselen = 0; s++; @@ -364,7 +346,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) else if (*s == ':') { cur = rfc822_new_address (); terminate_buffer (phrase, phraselen); - cur->mailbox = safe_strdup (phrase); + cur->mailbox = str_dup (phrase); cur->group = 1; if (last) @@ -373,10 +355,6 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) top = cur; last = cur; -#ifdef EXACT_ADDRESS - last->val = mutt_substrdup (begin, s); -#endif - phraselen = 0; commentlen = 0; s++; @@ -391,12 +369,8 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) } else if (commentlen && last && !last->personal) { terminate_buffer (comment, commentlen); - last->personal = safe_strdup (comment); + last->personal = str_dup (comment); } -#ifdef EXACT_ADDRESS - if (last && !last->val) - last->val = mutt_substrdup (begin, s); -#endif /* add group terminator */ cur = rfc822_new_address (); @@ -416,10 +390,10 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) cur = rfc822_new_address (); if (phraselen) { if (cur->personal) - FREE (&cur->personal); + mem_free (&cur->personal); /* if we get something like "Michael R. Elkins" remove the quotes */ rfc822_dequote_comment (phrase); - cur->personal = safe_strdup (phrase); + cur->personal = str_dup (phrase); } if ((ps = parse_route_addr (s + 1, comment, &commentlen, @@ -461,12 +435,8 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) } else if (commentlen && last && !last->personal) { terminate_buffer (comment, commentlen); - last->personal = safe_strdup (comment); + last->personal = str_dup (comment); } -#ifdef EXACT_ADDRESS - if (last) - last->val = mutt_substrdup (begin, s); -#endif return top; } @@ -477,9 +447,9 @@ void rfc822_qualify (ADDRESS * addr, const char *host) 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 = mem_malloc (str_len (addr->mailbox) + str_len (host) + 2); sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */ - FREE (&addr->mailbox); + mem_free (&addr->mailbox); addr->mailbox = p; } } @@ -520,25 +490,6 @@ 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 = mutt_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) @@ -566,7 +517,7 @@ void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr, if (!buflen) goto done; strfcpy (pbuf, addr->personal, buflen); - len = mutt_strlen (pbuf); + len = str_len (pbuf); pbuf += len; buflen -= len; } @@ -589,11 +540,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); - len = mutt_strlen (pbuf); + len = str_len (pbuf); } else if (ascii_strcmp (addr->mailbox, "@") && display) { strfcpy (pbuf, mutt_addr_for_display (addr), buflen); - len = mutt_strlen (pbuf); + len = str_len (pbuf); } else { *pbuf = '\0'; @@ -637,7 +588,7 @@ void rfc822_write_address (char *buf, size_t buflen, ADDRESS * addr, int display) { char *pbuf = buf; - size_t len = mutt_strlen (buf); + size_t len = str_len (buf); buflen--; /* save room for the terminal nul */ @@ -664,7 +615,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 */ - len = mutt_strlen (pbuf); + len = str_len (pbuf); pbuf += len; buflen -= len; @@ -690,11 +641,8 @@ ADDRESS *rfc822_cpy_adr_real (ADDRESS * addr) { 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 = str_dup (addr->personal); + p->mailbox = str_dup (addr->mailbox); p->group = addr->group; return p; } @@ -732,31 +680,3 @@ ADDRESS *rfc822_append (ADDRESS ** a, ADDRESS * b) tmp = tmp->next; return tmp; } - -#ifdef TESTING -int safe_free (void **p) -{ - free (*p); /* __MEM_CHECKED__ */ - *p = 0; -} - -int main (int argc, char **argv) -{ - ADDRESS *list; - char buf[256]; - -# if 0 - char *str = - "michael, Michael Elkins , testing a really complex address: this example <@contains.a.source.route,@with.multiple.hosts:address@example.com>;, lothar@of.the.hillpeople (lothar)"; -# else - char *str = "a b c "; -# endif - - list = rfc822_parse_adrlist (NULL, str); - buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), list); - rfc822_free_address (&list); - puts (buf); - exit (0); -} -#endif