projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
rfc822.c
diff --git
a/rfc822.c
b/rfc822.c
index
f1c86e9
..
64b1606
100644
(file)
--- a/
rfc822.c
+++ b/
rfc822.c
@@
-70,9
+70,6
@@
void rfc822_free_address (ADDRESS ** p)
while (*p) {
t = *p;
*p = (*p)->next;
while (*p) {
t = *p;
*p = (*p)->next;
-#ifdef EXACT_ADDRESS
- FREE (&t->val);
-#endif
FREE (&t->personal);
FREE (&t->mailbox);
FREE (&t);
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);
}
last->personal = safe_strdup (comment);
}
-#ifdef EXACT_ADDRESS
- if (last && !last->val)
- last->val = mutt_substrdup (begin, s);
-#endif
commentlen = 0;
phraselen = 0;
s++;
commentlen = 0;
phraselen = 0;
s++;
@@
-361,10
+354,6
@@
ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
top = cur;
last = cur;
top = cur;
last = cur;
-#ifdef EXACT_ADDRESS
- last->val = mutt_substrdup (begin, s);
-#endif
-
phraselen = 0;
commentlen = 0;
s++;
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);
}
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 ();
/* 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);
}
terminate_buffer (comment, commentlen);
last->personal = safe_strdup (comment);
}
-#ifdef EXACT_ADDRESS
- if (last)
- last->val = mutt_substrdup (begin, s);
-#endif
return top;
}
return top;
}
@@
-465,7
+446,7
@@
void rfc822_qualify (ADDRESS * addr, const char *host)
for (; addr; addr = addr->next)
if (!addr->group && addr->mailbox && strchr (addr->mailbox, '@') == NULL) {
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;
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
FREE (&addr->mailbox);
addr->mailbox = p;
@@
-508,25
+489,6
@@
void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
buflen--; /* save room for the terminal nul */
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)
if (addr->personal) {
if (strpbrk (addr->personal, RFC822Specials)) {
if (!buflen)
@@
-554,7
+516,7
@@
void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
if (!buflen)
goto done;
strfcpy (pbuf, addr->personal, buflen);
if (!buflen)
goto done;
strfcpy (pbuf, addr->personal, buflen);
- len =
mutt
_strlen (pbuf);
+ len =
safe
_strlen (pbuf);
pbuf += len;
buflen -= len;
}
pbuf += len;
buflen -= len;
}
@@
-577,11
+539,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);
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);
}
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';
}
else {
*pbuf = '\0';
@@
-625,7
+587,7
@@
void rfc822_write_address (char *buf, size_t buflen, ADDRESS * addr,
int display)
{
char *pbuf = buf;
int display)
{
char *pbuf = buf;
- size_t len =
mutt
_strlen (buf);
+ size_t len =
safe
_strlen (buf);
buflen--; /* save room for the terminal nul */
buflen--; /* save room for the terminal nul */
@@
-652,7
+614,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 */
/* 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;
pbuf += len;
buflen -= len;
@@
-678,9
+640,6
@@
ADDRESS *rfc822_cpy_adr_real (ADDRESS * addr)
{
ADDRESS *p = rfc822_new_address ();
{
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;
p->personal = safe_strdup (addr->personal);
p->mailbox = safe_strdup (addr->mailbox);
p->group = addr->group;