projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble.
[apps/madmutt.git]
/
lib-mime
/
rfc822.c
diff --git
a/lib-mime/rfc822.c
b/lib-mime/rfc822.c
index
22e54a4
..
8d19288
100644
(file)
--- a/
lib-mime/rfc822.c
+++ b/
lib-mime/rfc822.c
@@
-452,22
+452,19
@@
rfc822_write_address(char *buf, ssize_t buflen, address_t *addr, int display)
buf[pos++] = ' ';
}
buf[pos++] = ' ';
}
-
while (addr
) {
+
for (; addr; addr = addr->next
) {
pos += rfc822_write_address_single(buf + pos, buflen + 1 - pos,
addr, display);
pos += rfc822_write_address_single(buf + pos, buflen + 1 - pos,
addr, display);
- /* if there is another address, and its not a group mailbox name or
- group terminator, add a comma to separate the addresses */
+
if (!addr->group && addr->next && addr->next->mailbox) {
if (!addr->group && addr->next && addr->next->mailbox) {
+ /* if there is another address, and its not a group mailbox name or
+ group terminator, add a comma to separate the addresses */
if (pos + 2 >= buflen)
if (pos + 2 >= buflen)
- goto done;
- if (!buflen)
- goto done;
+ break;
buf[pos++] = ',';
buf[pos++] = ' ';
}
buf[pos++] = ',';
buf[pos++] = ' ';
}
-
- addr = addr->next;
}
done:
}
done: