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
64b1606
..
5dc33e2
100644
(file)
--- a/
rfc822.c
+++ b/
rfc822.c
@@
-16,6
+16,7
@@
#include <stdlib.h>
#include "mutt.h"
#include <stdlib.h>
#include "mutt.h"
+#include "ascii.h"
#include "mutt_idna.h"
#include "lib/mem.h"
#include "mutt_idna.h"
#include "lib/mem.h"
@@
-70,9
+71,9
@@
void rfc822_free_address (ADDRESS ** p)
while (*p) {
t = *p;
*p = (*p)->next;
while (*p) {
t = *p;
*p = (*p)->next;
-
FREE
(&t->personal);
-
FREE
(&t->mailbox);
-
FREE
(&t);
+
mem_free
(&t->personal);
+
mem_free
(&t->mailbox);
+
mem_free
(&t);
}
}
}
}
@@
-205,11
+206,11
@@
static const char *parse_address (const char *s,
}
terminate_string (token, *tokenlen, tokenmax);
}
terminate_string (token, *tokenlen, tokenmax);
- addr->mailbox = s
afe_str
dup (token);
+ addr->mailbox = s
tr_
dup (token);
if (*commentlen && !addr->personal) {
terminate_string (comment, *commentlen, commentmax);
if (*commentlen && !addr->personal) {
terminate_string (comment, *commentlen, commentmax);
- addr->personal = s
afe_str
dup (comment);
+ addr->personal = s
tr_
dup (comment);
}
return s;
}
return s;
@@
-254,7
+255,7
@@
static const char *parse_route_addr (const char *s,
}
if (!addr->mailbox)
}
if (!addr->mailbox)
- addr->mailbox = s
afe_str
dup ("@");
+ addr->mailbox = s
tr_
dup ("@");
s++;
return s;
s++;
return s;
@@
-322,7
+323,7
@@
ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
- last->personal = s
afe_str
dup (comment);
+ last->personal = s
tr_
dup (comment);
}
commentlen = 0;
}
commentlen = 0;
@@
-345,7
+346,7
@@
ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
else if (*s == ':') {
cur = rfc822_new_address ();
terminate_buffer (phrase, phraselen);
else if (*s == ':') {
cur = rfc822_new_address ();
terminate_buffer (phrase, phraselen);
- cur->mailbox = s
afe_str
dup (phrase);
+ cur->mailbox = s
tr_
dup (phrase);
cur->group = 1;
if (last)
cur->group = 1;
if (last)
@@
-368,7
+369,7
@@
ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
- last->personal = s
afe_str
dup (comment);
+ last->personal = s
tr_
dup (comment);
}
/* add group terminator */
}
/* add group terminator */
@@
-389,10
+390,10
@@
ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
cur = rfc822_new_address ();
if (phraselen) {
if (cur->personal)
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);
/* if we get something like "Michael R. Elkins" remove the quotes */
rfc822_dequote_comment (phrase);
- cur->personal = s
afe_str
dup (phrase);
+ cur->personal = s
tr_
dup (phrase);
}
if ((ps =
parse_route_addr (s + 1, comment, &commentlen,
}
if ((ps =
parse_route_addr (s + 1, comment, &commentlen,
@@
-434,7
+435,7
@@
ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
}
else if (commentlen && last && !last->personal) {
terminate_buffer (comment, commentlen);
- last->personal = s
afe_str
dup (comment);
+ last->personal = s
tr_
dup (comment);
}
return top;
}
return top;
@@
-446,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) {
for (; addr; addr = addr->next)
if (!addr->group && addr->mailbox && strchr (addr->mailbox, '@') == NULL) {
- p =
safe_malloc (safe_strlen (addr->mailbox) + safe_str
len (host) + 2);
+ p =
mem_malloc (str_len (addr->mailbox) + str_
len (host) + 2);
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
sprintf (p, "%s@%s", addr->mailbox, host); /* __SPRINTF_CHECKED__ */
-
FREE
(&addr->mailbox);
+
mem_free
(&addr->mailbox);
addr->mailbox = p;
}
}
addr->mailbox = p;
}
}
@@
-516,7
+517,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 = s
afe_str
len (pbuf);
+ len = s
tr_
len (pbuf);
pbuf += len;
buflen -= len;
}
pbuf += len;
buflen -= len;
}
@@
-539,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);
goto done;
if (ascii_strcmp (addr->mailbox, "@") && !display) {
strfcpy (pbuf, addr->mailbox, buflen);
- len = s
afe_str
len (pbuf);
+ len = s
tr_
len (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 = s
afe_str
len (pbuf);
+ len = s
tr_
len (pbuf);
}
else {
*pbuf = '\0';
}
else {
*pbuf = '\0';
@@
-587,7
+588,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 = s
afe_str
len (buf);
+ size_t len = s
tr_
len (buf);
buflen--; /* save room for the terminal nul */
buflen--; /* save room for the terminal nul */
@@
-614,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 */
/* 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 = s
afe_str
len (pbuf);
+ len = s
tr_
len (pbuf);
pbuf += len;
buflen -= len;
pbuf += len;
buflen -= len;
@@
-640,8
+641,8
@@
ADDRESS *rfc822_cpy_adr_real (ADDRESS * addr)
{
ADDRESS *p = rfc822_new_address ();
{
ADDRESS *p = rfc822_new_address ();
- p->personal = s
afe_str
dup (addr->personal);
- p->mailbox = s
afe_str
dup (addr->mailbox);
+ p->personal = s
tr_
dup (addr->personal);
+ p->mailbox = s
tr_
dup (addr->mailbox);
p->group = addr->group;
return p;
}
p->group = addr->group;
return p;
}