tyrolyean/mailattach
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved file close

Browse source 
Signed-off-by: Tyrolyean <tyrolyean@tyrolyean.net>
This commit is contained in:
Tyrolyean 2020-04-25 01:55:49 +02:00
parent f611b9d729
commit ece1e21535
No known key found for this signature in database
GPG key ID: 81EC9BAC5E9667C6
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.c
View file

@ -40,17 +40,13 @@ sfsistat mlfi_cleanup(SMFICTX* ctx, bool ok) {
return rstat; return rstat;
} }
/* close the archive file */ if (ok){
if (priv->mlfi_fp != NULL && fclose(priv->mlfi_fp) == EOF){
/* failed; we have to wait until later */
rstat = SMFIS_TEMPFAIL;
(void) unlink(priv->mlfi_fname);
} else if (ok){
/* add a header to the message announcing our presence */ /* add a header to the message announcing our presence */
smfi_addheader(ctx, "X-Mail-Attached", VERSION); smfi_addheader(ctx, "X-Mail-Attached", VERSION);
/* replace body if attachements have been found */ /* replace body if attachements have been found */
char* new_body = attach_files(priv->mlfi_fp); char* new_body = attach_files(priv->mlfi_fp);
if(new_body != NULL){ if(new_body != NULL){
@ -68,7 +64,12 @@ sfsistat mlfi_cleanup(SMFICTX* ctx, bool ok) {
} }
} }
} }
/* close the archive file */
if (priv->mlfi_fp != NULL && fclose(priv->mlfi_fp) == EOF){
/* failed; we have to wait until later */
rstat = SMFIS_TEMPFAIL;
(void) unlink(priv->mlfi_fname);
}
/* In any case release the temporary data storage file */ /* In any case release the temporary data storage file */
(void) unlink(priv->mlfi_fname); (void) unlink(priv->mlfi_fname);