X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc822.c;h=19fb086987af2cee09d9e34b32d7b9319f45742a;hp=f1c86e9d846f5fec9707f4fc32962e5e53a626f0;hb=7048f7d738dac900f2e76622f3d92b62f99b69a7;hpb=6b7b63a19879252a83f7010a52204e366a544d7e diff --git a/rfc822.c b/rfc822.c index f1c86e9..19fb086 100644 --- a/rfc822.c +++ b/rfc822.c @@ -70,9 +70,6 @@ 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); @@ -328,10 +325,6 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) last->personal = safe_strdup (comment); } -#ifdef EXACT_ADDRESS - if (last && !last->val) - last->val = mutt_substrdup (begin, s); -#endif commentlen = 0; phraselen = 0; s++; @@ -361,10 +354,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++; @@ -381,10 +370,6 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) terminate_buffer (comment, commentlen); last->personal = safe_strdup (comment); } -#ifdef EXACT_ADDRESS - if (last && !last->val) - last->val = mutt_substrdup (begin, s); -#endif /* add group terminator */ cur = rfc822_new_address (); @@ -451,10 +436,6 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s) terminate_buffer (comment, commentlen); last->personal = safe_strdup (comment); } -#ifdef EXACT_ADDRESS - if (last) - last->val = mutt_substrdup (begin, s); -#endif return top; } @@ -508,25 +489,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) @@ -678,9 +640,6 @@ 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->group = addr->group;