From 85832555b8d510499b13bc454e458382d36e195d Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Fri, 3 Nov 2006 22:32:04 +0100 Subject: [PATCH] wibble. Signed-off-by: Pierre Habouzit --- lib-mime/rfc822.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib-mime/rfc822.c b/lib-mime/rfc822.c index 22e54a4..8d19288 100644 --- 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++] = ' '; } - while (addr) { + for (; addr; addr = addr->next) { 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 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) - goto done; - if (!buflen) - goto done; + break; buf[pos++] = ','; buf[pos++] = ' '; } - - addr = addr->next; } done: -- 2.20.1