changeset 364:fe02eed54635

fix typo
author mmj
date Fri, 12 Nov 2004 02:26:43 +1100
parents 000cf869301c
children 24a86824b6b8
files src/mlmmj-sub.c src/mlmmj-unsub.c src/prepstdreply.c
diffstat 3 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/mlmmj-sub.c	Fri Nov 12 01:54:55 2004 +1100
+++ b/src/mlmmj-sub.c	Fri Nov 12 02:26:43 2004 +1100
@@ -62,13 +62,13 @@
 
 	switch(typesub) {
 		case SUB_NORMAL:
-			listtext = mystrdup("/text/sub-ok");
+			listtext = mystrdup("sub-ok");
 			break;
 		case SUB_DIGEST:
-			listtext = mystrdup("/text/sub-ok-digest");
+			listtext = mystrdup("sub-ok-digest");
 			break;
 		case SUB_NOMAIL:
-			listtext = mystrdup("/text/sub-ok-nomail");
+			listtext = mystrdup("sub-ok-nomail");
 			break;
 	}
 
@@ -118,7 +118,7 @@
 	}
 
 	queuefilename = prepstdreply(listdir, listtext, "$listowner$",
-				"$listowner", NULL, 1, maildata);
+				"$listowner$", NULL, 1, maildata);
 	MY_ASSERT(queuefilename)
 	myfree(listtext);
 	myfree(maildata[1]);
--- a/src/mlmmj-unsub.c	Fri Nov 12 01:54:55 2004 +1100
+++ b/src/mlmmj-unsub.c	Fri Nov 12 02:26:43 2004 +1100
@@ -62,13 +62,13 @@
 
 	switch(typesub) {
 		case SUB_NORMAL:
-			listtext = mystrdup("/text/unsub-ok");
+			listtext = mystrdup("unsub-ok");
 			break;
 		case SUB_DIGEST:
-			listtext = mystrdup("/text/unsub-ok-digest");
+			listtext = mystrdup("unsub-ok-digest");
 			break;
 		case SUB_NOMAIL:
-			listtext = mystrdup("/text/unsub-ok-nomail");
+			listtext = mystrdup("unsub-ok-nomail");
 			break;
 	}
 
--- a/src/prepstdreply.c	Fri Nov 12 01:54:55 2004 +1100
+++ b/src/prepstdreply.c	Fri Nov 12 02:26:43 2004 +1100
@@ -120,7 +120,7 @@
 {
 	int infd, outfd;
 	char *listaddr, *myfrom, *str, *tmp, *subject, *retstr = NULL;
-	char *myreplyto;
+	char *myreplyto, *myto;
 
 	tmp = concatstr(3, listdir, "/text/", filename);
 	infd = open(tmp, O_RDONLY);
@@ -143,6 +143,7 @@
 	myfree(tmp);
 	
 	myfrom = substitute(from, listaddr, tokencount, data);
+	myto = substitute(to, listaddr, tokencount, data);
 
 	if(replyto)
 		myreplyto = substitute(replyto, listaddr, tokencount, data);
@@ -165,8 +166,8 @@
 		return NULL;
 	}
 
-	str = concatstr(8, "From: ", myfrom, "\nTo: ", to, "\nReply-To: ",
-			replyto, "\n", subject);
+	str = concatstr(8, "From: ", myfrom, "\nTo: ", myto, "\nReply-To: ",
+			myreplyto, "\n", subject);
 
 	if(writen(outfd, str, strlen(str)) < 0) {
 		log_error(LOG_ARGS, "Could not write std mail");