Mercurial > hg > mlmmj

changeset 363:000cf869301c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further fixups to new prepstdreply. Seems to work now, needs more testing though
author mmj
date Fri, 12 Nov 2004 01:54:55 +1100
parents 4c1afa9908ab
children fe02eed54635
files src/mlmmj-bounce.c src/mlmmj-process.c src/mlmmj-sub.c src/mlmmj-unsub.c src/prepstdreply.c
diffstat 5 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/mlmmj-bounce.c	Fri Nov 12 00:35:38 2004 +1100
+++ b/src/mlmmj-bounce.c	Fri Nov 12 01:54:55 2004 +1100
@@ -98,7 +98,7 @@
 {
 	char *myaddr, *from, *a, *indexstr, *queuefilename, *listaddr;
 	char *listfqdn, *listname, *probefile;
-	char *maildata[] = { "$bouncenumbers$", NULL };
+	char *maildata[] = { "bouncenumbers", NULL };
 	int fd;
 	time_t t;
 
--- a/src/mlmmj-process.c	Fri Nov 12 00:35:38 2004 +1100
+++ b/src/mlmmj-process.c	Fri Nov 12 01:54:55 2004 +1100
@@ -345,7 +345,7 @@
 	char *bindir, *subjectprefix, *discardname, *listaddr;
 	char *listfqdn, *listname, *fromaddr;
 	char *queuefilename, *recipdelim, *owner = NULL;
-	char *maildata[2];
+	char *maildata[2] = { "posteraddr", NULL };
 	struct stat st;
 	uid_t uid;
 	struct email_container fromemails = { 0, NULL };
@@ -647,7 +647,6 @@
 		if(is_subbed(listdir, fromemails.emaillist[0]) != 0) {
 			listname = genlistname(listaddr);
 			listfqdn = genlistfqdn(listaddr);
-			maildata[0] = "$posteraddr$";
 			maildata[1] = fromemails.emaillist[0];
 			fromaddr = concatstr(3, listname, "+bounces-help@",
 					listfqdn);
--- a/src/mlmmj-sub.c	Fri Nov 12 00:35:38 2004 +1100
+++ b/src/mlmmj-sub.c	Fri Nov 12 01:54:55 2004 +1100
@@ -90,7 +90,7 @@
 		const char *subaddr, const char *mlmmjsend,
 		enum subtype typesub)
 {
-	char *maildata[2] = { "$newsub$", NULL };
+	char *maildata[2] = { "newsub", NULL };
 	char *listfqdn, *listname, *fromaddr, *tostr;
 	char *queuefilename = NULL, *listtext;
 
@@ -140,7 +140,7 @@
 	char *confirmaddr, *listname, *listfqdn, *confirmfilename = NULL;
 	char *listtext, *queuefilename = NULL, *fromaddr;
 	char *randomstr = NULL, *tmpstr;
-	char *maildata[4] = { "$subaddr$", NULL, "$confaddr$", NULL };
+	char *maildata[4] = { "subaddr", NULL, "confaddr", NULL };
 
 	listname = genlistname(listaddr);
 	listfqdn = genlistfqdn(listaddr);
--- a/src/mlmmj-unsub.c	Fri Nov 12 00:35:38 2004 +1100
+++ b/src/mlmmj-unsub.c	Fri Nov 12 01:54:55 2004 +1100
@@ -91,7 +91,7 @@
 		  const char *subaddr, const char *mlmmjsend,
 		  enum subtype typesub)
 {
-        char *maildata[4] = { "$oldsub$", NULL };
+        char *maildata[4] = { "oldsub", NULL };
         char *listfqdn, *listname, *fromaddr, *tostr;
         char *queuefilename = NULL, *listtext;
 
@@ -142,7 +142,7 @@
 	char *confirmaddr, *listname, *listfqdn, *tmpstr;
 	char *queuefilename, *fromaddr;
 	char *randomstr = NULL, *confirmfilename = NULL, *listtext;
-	char *maildata[4] = { "$subaddr$", NULL, "$confaddr$", NULL };
+	char *maildata[4] = { "subaddr", NULL, "confaddr", NULL };
 	int subconffd;
 
 	listname = genlistname(listaddr);
--- a/src/prepstdreply.c	Fri Nov 12 00:35:38 2004 +1100
+++ b/src/prepstdreply.c	Fri Nov 12 01:54:55 2004 +1100
@@ -42,8 +42,8 @@
 char *substitute(const char *line, const char *listaddr, size_t datacount,
 		 char **data)
 {
-	char *fqdn, *listname, *d1, *d2, *token, *value, *retstr;
-	char *origline = mystrdup(line);
+	char *fqdn, *listname, *d1, *d2, *token, *value = NULL;
+	char *retstr, *origline = mystrdup(line);
 	size_t len, i;
 	
 	d1 = strchr(origline, '$');
@@ -165,7 +165,8 @@
 		return NULL;
 	}
 
-	str = concatstr(4, myfrom, to, replyto, subject);
+	str = concatstr(8, "From: ", myfrom, "\nTo: ", to, "\nReply-To: ",
+			replyto, "\n", subject);
 
 	if(writen(outfd, str, strlen(str)) < 0) {
 		log_error(LOG_ARGS, "Could not write std mail");