# HG changeset patch
# User mortenp
# Date 1082628481 -36000
# Node ID e447e60333875012be4683982f370b2572f0f1db
# Parent  9eea0c9ae1136e1c53ce89d6beeb4daa3f627a57
cleaned up bounce_from_adr()

diff -r 9eea0c9ae113 -r e447e6033387 src/mlmmj-send.c
--- a/src/mlmmj-send.c	Thu Apr 22 06:35:57 2004 +1000
+++ b/src/mlmmj-send.c	Thu Apr 22 20:08:01 2004 +1000
@@ -35,36 +35,47 @@
 	exit(EXIT_SUCCESS);
 }
 
-char *bounce_from_adr(char *bounce_adr, const char *from, const
-		char *listadr, const char *mailfilename)
+static char *bounce_from_adr(char *recipient, char *listadr, char *mailfilename)
 {
-	char *tmp;
-	char *i;
-	char indexstr[20];
-	int j, k;
+	char *bounce_adr;
+	char *indexstr, *listdomain, *a;
+	size_t len;
+
+	indexstr = strrchr(mailfilename, '/');
+	if (!indexstr) indexstr = mailfilename;
 
-	for(j = strlen(mailfilename)-1, k = 0; mailfilename[j] != '/'; j--, k++)
-		indexstr[k] = mailfilename[j];
-	indexstr[k] = 0;
-	
-	reversestr(indexstr);
+	recipient = strdup(recipient);
+	if (!recipient) {
+		return NULL;
+	}
+	a = strchr(recipient, '@');
+	if (a) *a = '=';
 
-	tmp = malloc(strlen(from) + 1);
-	memcpy(tmp, from, strlen(from) + 1);
-	i = index(tmp, '@');
-	*i = '=';
-	i = index(listadr, '@');
+	listadr = strdup(listadr);
+	if (!listadr) {
+		free(recipient);
+		return NULL;
+	}
+
+	listdomain = strchr(listadr, '@');
+	if (!listdomain) {
+		free(recipient);
+		free(listadr);
+	}
+	*listdomain++ = '\0';
 
-	memcpy(bounce_adr, listadr, i - listadr);
-	strncat(bounce_adr, "-bounces", 8);
-	bounce_adr[strlen(bounce_adr)] = RECIPDELIM;
-	strncat(bounce_adr, tmp, strlen(tmp));
-	bounce_adr[strlen(bounce_adr)] = '-';
-	bounce_adr[strlen(bounce_adr)+1] = 0;
-	strncat(bounce_adr, indexstr, strlen(indexstr));
-	strncat(bounce_adr, i, strlen(i));
-	free(tmp);
+	// 11 = "-bounces" + RECIPDELIM + "@" + NUL
+	len = strlen(listadr) + strlen(recipient) + strlen(listdomain) + 11;
+	bounce_adr = malloc(len);
+	if (!bounce_adr) {
+		free(recipient);
+		free(listadr);
+		return NULL;
+	}
+	snprintf(bounce_adr, len, "%s-bounces%c%s@%s", listadr, RECIPDELIM, recipient, listdomain);
 
+	free(recipient);
+	free(listadr);
 	return bounce_adr;
 }
 
@@ -255,10 +266,7 @@
 	if(listdir[0] != '1') {
 		while((bufres = fgets(buf, READ_BUFSIZE, subfile))) {
 			chomp(buf);
-			len = strlen(buf) + strlen(listadr) + 256;
-			bounce_adr = malloc(len);
-			memset(bounce_adr, 0, len);
-			bounce_from_adr(bounce_adr, buf, listadr,
+			bounce_adr = bounce_from_adr(buf, listadr,
 					archivefilename);
 
 			send_mail(sockfd, bounce_adr, buf, 0, mailfile);