Skip to content

Commit 32555e2

Browse files
Jose Kahanjkbzh
authored andcommitted
JK: attachments of deleted messages were still being written
1 parent e8853fb commit 32555e2

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

Changelog

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ Version Changes for Hypermail
44
============================
55
HYPERMAIL VERSION 2.3.1:
66
============================
7+
8+
Jose Kahan (Jun 10, 2013)
9+
- Even if a message was annotated as spam/deleted, its Attachments were
10+
still being created
11+
712
Jose Kahan (Apr 18, 2013)
813
- Removed commented out code in printfile.c.
914
- Added missing ';' in generated css rules in the same file
1015

1116
Jose Kahan (Apr 11, 2013)
1217
- Extended the configure options so that a user can decide if hypermail
1318
should be compiled and statically linked against the bundled pcre lib or
14-
if it should be dynamically linked with an external (or system) pcre
15-
library (if available).
19+
if it should be dynamically linked with an external (or system) pcre
20+
library (if available).
1621
The new configure option is --with-external-pcre[=dir].
1722
The default value for dir is /usr and the include and libraries directories
1823
will be searched from that starting path. This option is disabled by default.
1924
- the make clean in libfnv wasn't removing the libfnv.a file
2025

2126
Jose Kahan (Mar 29, 2013)
22-
- Updated configure to latest autoconf syntax conventions.
27+
- Updated configure to latest autoconf syntax conventions.
2328
Renamed configure.in to configure.ac and cleaned it up partially.
2429

2530
Jose Kahan (Mar 20, 2013)

src/parse.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2738,6 +2738,13 @@ msgid);
27382738
}
27392739
else if (content == CONTENT_BINARY) {
27402740

2741+
/* don't create the attachments of deleted files */
2742+
/* (JK: this seems like a good place to call emptydir() to remove
2743+
existing attachments) from deleted messages */
2744+
if (is_deleted && file_created == MAKE_FILE) {
2745+
file_created = MADE_FILE;
2746+
}
2747+
27412748
#ifndef REMOVED_990310
27422749
/* If there is no file created, we create and init one */
27432750
if (file_created == MAKE_FILE) {

0 commit comments

Comments
 (0)