changeset 333:d70614c2d99e

Save the raw incoming mail when discarding, not the processed one.
author mmj
date Fri, 10 Sep 2004 17:15:44 +1000
parents 1ec8a4491e4e
children 0a3a4868fd3c
files src/mlmmj-process.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/mlmmj-process.c	Fri Sep 10 17:10:54 2004 +1000
+++ b/src/mlmmj-process.c	Fri Sep 10 17:15:44 2004 +1000
@@ -496,7 +496,8 @@
 			discardname = concatstr(3, listdir,
 						"/queue/discarded/",
 						randomstr);
-			rename(donemailname, discardname);
+			rename(mailfile, discardname);
+			unlink(donemailname);
 			myfree(donemailname);
 			myfree(discardname);
 			myfree(randomstr);
@@ -565,14 +566,13 @@
 		return EXIT_SUCCESS;
 	}
 
-	unlink(mailfile);
-
 	if(efromemails.emailcount != 1) { /* don't send mails with <> in From
 					     to the list */
 		discardname = concatstr(3, listdir,
 				"/queue/discarded/",
 				randomstr);
-		rename(donemailname, discardname);
+		rename(mailfile, discardname);
+		unlink(donemailname);
 		myfree(donemailname);
 		myfree(discardname);
 		myfree(randomstr);
@@ -580,6 +580,8 @@
 		exit(EXIT_SUCCESS);
 	}
 
+	unlink(mailfile);
+
 	listaddr = getlistaddr(listdir);
 
 	addrtocc = !(statctrl(listdir, "tocc"));