projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use single-bit fields for global flags
[exim.git]
/
src
/
src
/
transports
/
appendfile.c
diff --git
a/src/src/transports/appendfile.c
b/src/src/transports/appendfile.c
index f1bc27dd8d6c859e338c5d4bcffa4338fee2aab2..b762b66a2b65bcb71c307bbfeafc8c6e67238b0e 100644
(file)
--- a/
src/src/transports/appendfile.c
+++ b/
src/src/transports/appendfile.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
6
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-310,7
+310,7
@@
for (i = 0; i < 5; i++)
{
*errmsg = string_sprintf("Expansion of \"%s\" in %s transport failed: "
"%s", q, tblock->name, expand_string_message);
{
*errmsg = string_sprintf("Expansion of \"%s\" in %s transport failed: "
"%s", q, tblock->name, expand_string_message);
- return search_find_defer ? DEFER : FAIL;
+ return
f.
search_find_defer ? DEFER : FAIL;
}
d = Ustrtod(s, &rest);
}
d = Ustrtod(s, &rest);
@@
-945,9
+945,7
@@
copy_mbx_message(int to_fd, int from_fd, off_t saved_size)
int used;
off_t size;
struct stat statbuf;
int used;
off_t size;
struct stat statbuf;
-transport_ctx tctx = {{0}};
-
-tctx.u.fd = to_fd;
+transport_ctx tctx = { .u={.fd = to_fd}, .options = topt_not_socket };
/* If the current mailbox size is zero, write a header block */
/* If the current mailbox size is zero, write a header block */
@@
-1437,7
+1435,7
@@
DEBUG(D_transport)
/* If the -N option is set, can't do any more. */
/* If the -N option is set, can't do any more. */
-if (dont_deliver)
+if (
f.
dont_deliver)
{
DEBUG(D_transport)
debug_printf("*** delivery by %s transport bypassed by -N option\n",
{
DEBUG(D_transport)
debug_printf("*** delivery by %s transport bypassed by -N option\n",
@@
-2553,7
+2551,7
@@
else
$message_size is accurately known. */
if (nametag != NULL && expand_string(nametag) == NULL &&
$message_size is accurately known. */
if (nametag != NULL && expand_string(nametag) == NULL &&
- !expand_string_forcedfail)
+ !
f.
expand_string_forcedfail)
{
addr->transport_return = PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (maildir_tag "
{
addr->transport_return = PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (maildir_tag "
@@
-2690,7
+2688,7
@@
else
uschar *s = expand_string(ob->mailstore_prefix);
if (s == NULL)
{
uschar *s = expand_string(ob->mailstore_prefix);
if (s == NULL)
{
- if (!expand_string_forcedfail)
+ if (!
f.
expand_string_forcedfail)
{
addr->transport_return = PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (mailstore "
{
addr->transport_return = PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (mailstore "
@@
-2719,7
+2717,7
@@
else
uschar *s = expand_string(ob->mailstore_suffix);
if (s == NULL)
{
uschar *s = expand_string(ob->mailstore_suffix);
if (s == NULL)
{
- if (!expand_string_forcedfail)
+ if (!
f.
expand_string_forcedfail)
{
addr->transport_return = PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (mailstore "
{
addr->transport_return = PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (mailstore "
@@
-2921,12
+2919,12
@@
at initialization time. */
if (yield == OK)
{
transport_ctx tctx = {
if (yield == OK)
{
transport_ctx tctx = {
-
{
fd},
- tblock,
- addr,
- ob->check_string,
- ob->escape_string,
- ob->options
+
.u = {.fd=
fd},
+
.tblock =
tblock,
+
.addr =
addr,
+
.check_string =
ob->check_string,
+
.escape_string =
ob->escape_string,
+ .options = ob->options | topt_not_socket
};
if (!transport_write_message(&tctx, 0))
yield = DEFER;
};
if (!transport_write_message(&tctx, 0))
yield = DEFER;
@@
-3082,7
+3080,7
@@
if (yield != OK)
}
else /* Want a repeatable time when in test harness */
{
}
else /* Want a repeatable time when in test harness */
{
- addr->more_errno = running_in_test_harness ? 10 :
+ addr->more_errno =
f.
running_in_test_harness ? 10 :
(int)time(NULL) - statbuf.st_mtime;
}
DEBUG(D_transport)
(int)time(NULL) - statbuf.st_mtime;
}
DEBUG(D_transport)