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
Documentation and comment tidies.
[exim.git]
/
src
/
src
/
spool_out.c
diff --git
a/src/src/spool_out.c
b/src/src/spool_out.c
index 8feaf860f0e8fcc3d939464872480d23dfa66e59..0a17b7a13eb6fa3c7ffa51d8762c8f20f3e9fa7d 100644
(file)
--- a/
src/src/spool_out.c
+++ b/
src/src/spool_out.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/spool_out.c,v 1.
6 2005/02/17 11:58:26
ph10 Exp $ */
+/* $Cambridge: exim/src/src/spool_out.c,v 1.
11 2006/09/19 11:28:45
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
6
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing spool files, and moving them about. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing spool files, and moving them about. */
@@
-48,7
+48,7
@@
uschar *msg = (where == SW_RECEIVING)?
strerror(errno));
if (temp_name != NULL) Uunlink(temp_name);
strerror(errno));
if (temp_name != NULL) Uunlink(temp_name);
-if (f != NULL) fclose(f);
+if (f != NULL)
(void)
fclose(f);
if (errmsg == NULL)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s", msg);
if (errmsg == NULL)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s", msg);
@@
-96,8
+96,8
@@
automatically. */
if (fd >= 0)
{
if (fd >= 0)
{
- fchown(fd, exim_uid, exim_gid);
- fchmod(fd, SPOOL_MODE);
+
(void)
fchown(fd, exim_uid, exim_gid);
+
(void)
fchmod(fd, SPOOL_MODE);
}
return fd;
}
return fd;
@@
-190,14
+190,10
@@
if (sender_ident != NULL) fprintf(f, "-ident %s\n", sender_ident);
if (received_protocol != NULL)
fprintf(f, "-received_protocol %s\n", received_protocol);
if (received_protocol != NULL)
fprintf(f, "-received_protocol %s\n", received_protocol);
-/* Preserve any ACL variables that are set. Because the values may contain
-newlines, we use an explicit length. */
+/* Preserve any ACL variables that are set. */
-for (i = 0; i < ACL_C_MAX + ACL_M_MAX; i++)
- {
- if (acl_var[i] != NULL)
- fprintf(f, "-acl %d %d\n%s\n", i, Ustrlen(acl_var[i]), acl_var[i]);
- }
+tree_walk(acl_var_c, &acl_var_write, f);
+tree_walk(acl_var_m, &acl_var_write, f);
/* Now any other data that needs to be remembered. */
/* Now any other data that needs to be remembered. */