JK: attachments of deleted messages were still being written

Author: Jose Kahan

Changelog

@@ -4,22 +4,27 @@ Version Changes for Hypermail
 ============================
 HYPERMAIL VERSION 2.3.1:
 ============================
+
+Jose Kahan (Jun 10, 2013)
+- Even if a message was annotated as spam/deleted, its Attachments were
+  still being created
+
 Jose Kahan (Apr 18, 2013)
 - Removed commented out code in printfile.c.
 - Added missing ';' in generated css rules in the same file
 
 Jose Kahan (Apr 11, 2013)
 - Extended the configure options  so that a user can decide if hypermail
   should be compiled and statically linked against the bundled pcre lib or
-  if it should be dynamically linked with an external (or system) pcre 
-  library (if available). 
+  if it should be dynamically linked with an external (or system) pcre
+  library (if available).
   The new configure option is --with-external-pcre[=dir].
   The default value for dir is /usr and the include and libraries directories
   will be searched from that starting path. This option is disabled by default.
 - the make clean in libfnv wasn't removing the libfnv.a file
 
 Jose Kahan (Mar 29, 2013)
-- Updated configure to latest autoconf syntax conventions. 
+- Updated configure to latest autoconf syntax conventions.
   Renamed configure.in to configure.ac and cleaned it up partially.
 
 Jose Kahan (Mar 20, 2013)

src/parse.c

@@ -2738,6 +2738,13 @@ msgid);
 		    }
 		    else if (content == CONTENT_BINARY) {
 
+		        /* don't create the attachments of deleted files */
+		        /* (JK: this seems like a good place to call emptydir() to remove
+			   existing attachments) from deleted messages */
+		        if (is_deleted && file_created == MAKE_FILE) {
+			  file_created = MADE_FILE;
+			}
+
 #ifndef REMOVED_990310
 			/* If there is no file created, we create and init one */
 			if (file_created == MAKE_FILE) {