# HG changeset patch
# User Ben Schmidt
# Date 1299194119 -39600
# Node ID a4a4b95c958c9045a5b35bc8142eeef97759f6e3
# Parent  44778d21edad5416f41530db13286adcbe35de71
Avoid trailing whitespace in MAIL FROM line (Lukas Fleischer)

diff -r 44778d21edad -r a4a4b95c958c src/mail-functions.c
--- 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);