git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
spool_mbox.c
diff --git
a/src/src/spool_mbox.c
b/src/src/spool_mbox.c
index cf7909fbe2b628afe0a3be75c9ccd5bb67d60bea..7ea565a58f32a7152e9575b103e54692ba2bea22 100644
(file)
--- a/
src/src/spool_mbox.c
+++ b/
src/src/spool_mbox.c
@@
-4,7
+4,8
@@
/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2020
+ * Copyright (c) The Exim Maintainers 2016 - 2021
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* Code for setting up a MBOX style spool file inside a /scan/<msgid>
*/
/* Code for setting up a MBOX style spool file inside a /scan/<msgid>
@@
-219,7
+220,7
@@
if (spool_mbox_ok && !f.no_mbox_unspool)
{
debug_printf("Unable to opendir(%s): %s\n", mbox_path, strerror(errno));
/* Just in case we still can: */
{
debug_printf("Unable to opendir(%s): %s\n", mbox_path, strerror(errno));
/* Just in case we still can: */
- rmdir(CS mbox_path);
+
(void)
rmdir(CS mbox_path);
return;
}
/* loop thru dir & delete entries */
return;
}
/* loop thru dir & delete entries */
@@
-230,13
+231,15
@@
if (spool_mbox_ok && !f.no_mbox_unspool)
file_path = string_sprintf("%s/%s", mbox_path, name);
debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
file_path = string_sprintf("%s/%s", mbox_path, name);
debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
- (void) unlink(CS file_path);
+ if (unlink(CS file_path) != 0)
+ log_write(0, LOG_MAIN|LOG_PANIC, "unlink(%s): %s", file_path, strerror(errno));
}
closedir(tempdir);
/* remove directory */
}
closedir(tempdir);
/* remove directory */
- rmdir(CS mbox_path);
+ if (rmdir(CS mbox_path) != 0)
+ log_write(0, LOG_MAIN|LOG_PANIC, "rmdir(%s): %s", mbox_path, strerror(errno));
store_reset(reset_point);
}
spool_mbox_ok = 0;
store_reset(reset_point);
}
spool_mbox_ok = 0;