Mercurial > hg > mlmmj
changeset 792:a4a4b95c958c
Avoid trailing whitespace in MAIL FROM line (Lukas Fleischer)
author | Ben Schmidt |
---|---|
date | Fri, 04 Mar 2011 10:15:19 +1100 |
parents | 44778d21edad |
children | 21265d660d19 |
files | src/mail-functions.c |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mail-functions.c Sun Dec 05 19:13:25 2010 +1100 +++ b/src/mail-functions.c Fri Mar 04 10:15:19 2011 +1100 @@ -61,7 +61,7 @@ myfree(helo); return 0; } -/* "MAIL FROM: <>\r\n" has length 15 */ +/* "MAIL FROM: <> \r\n" has length 16 */ #define EXTRA_FROM_LEN 16 int write_mail_from(int sockfd, const char *from_addr, const char *extra) { @@ -72,12 +72,12 @@ mail_from = mymalloc(len); - if(extra && extra[0] == ' ') + if(extra && extra[0] != '\0') { + if(extra[0] == ' ') extra++; snprintf(mail_from, len, "MAIL FROM: <%s>%s\r\n", from_addr, extra); - else - snprintf(mail_from, len, "MAIL FROM: <%s> %s\r\n", from_addr, - extra); + } else + snprintf(mail_from, len, "MAIL FROM: <%s>\r\n", from_addr); len = strlen(mail_from);