Mercurial > hg > mlmmj

changeset 411:79355dd5ecc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the envelope from match the new order (VERP prep) and also remove superflous call to myunlock().
author mmj
date Fri, 14 Jan 2005 06:35:22 +1100
parents ec14099453d6
children 66991b1776df
files src/mlmmj-send.c
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/mlmmj-send.c	Fri Jan 14 06:32:18 2005 +1100
+++ b/src/mlmmj-send.c	Fri Jan 14 06:35:22 2005 +1100
@@ -58,6 +58,7 @@
 #include "memory.h"
 #include "statctrl.h"
 #include "ctrlvalue.h"
+#include "mylocking.h"
 
 static int addtohdr = 0;
 static int prepmailinmem = 0;
@@ -115,7 +116,7 @@
 		return NULL;
 	}
 	snprintf(bounceaddr, len, "%s%cbounces-%s-%s@%s", mylistadr, RECIPDELIM,
-		 myrecipient, indexstr, listdomain);
+		 indexstr, myrecipient, listdomain);
 
 	myfree(myrecipient);
 	myfree(mylistadr);
@@ -876,17 +877,14 @@
 	close(mailfd);
 
 	if(archive) {
-		if(!ctrlarchive)
+		if(!ctrlarchive) {
 			rename(mailfilename, archivefilename);
-		else
+		} else {
 			unlink(mailfilename);
+		}
 		myfree(archivefilename);
 	} else if(deletewhensent)
 		unlink(mailfilename);
 
-	if(myunlock(mailfd) < 0)
-		log_error(LOG_ARGS, "Could not unlock '%s'", mailfilename);
-	
-
 	return EXIT_SUCCESS;
 }