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
Use retval from sprintf while walking buffers
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 0285e162a2bfad4a08206ce2ad1bcdefda266f8d..581b161903d6e7b20fb3bdfd4e18b02fe3c6fcd1 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-2738,7
+2738,7
@@
for (i = 1; i < argc; i++)
/* -MCD: set the smtp_use_dsn flag; this indicates that the host
that exim is connected to supports the esmtp extension DSN */
/* -MCD: set the smtp_use_dsn flag; this indicates that the host
that exim is connected to supports the esmtp extension DSN */
- case 'D': smtp_peer_options |=
PEER_OFFERED
_DSN; break;
+ case 'D': smtp_peer_options |=
OPTION
_DSN; break;
/* -MCG: set the queue name, to a non-default value */
/* -MCG: set the queue name, to a non-default value */
@@
-2748,12
+2748,12
@@
for (i = 1; i < argc; i++)
/* -MCK: the peer offered CHUNKING. Must precede -MC */
/* -MCK: the peer offered CHUNKING. Must precede -MC */
- case 'K': smtp_peer_options |=
PEER_OFFERED
_CHUNKING; break;
+ case 'K': smtp_peer_options |=
OPTION
_CHUNKING; break;
/* -MCP: set the smtp_use_pipelining flag; this is useful only when
it preceded -MC (see above) */
/* -MCP: set the smtp_use_pipelining flag; this is useful only when
it preceded -MC (see above) */
- case 'P': smtp_peer_options |=
PEER_OFFERED
_PIPE; break;
+ case 'P': smtp_peer_options |=
OPTION
_PIPE; break;
/* -MCQ: pass on the pid of the queue-running process that started
this chain of deliveries and the fd of its synchronizing pipe; this
/* -MCQ: pass on the pid of the queue-running process that started
this chain of deliveries and the fd of its synchronizing pipe; this
@@
-2768,7
+2768,7
@@
for (i = 1; i < argc; i++)
/* -MCS: set the smtp_use_size flag; this is useful only when it
precedes -MC (see above) */
/* -MCS: set the smtp_use_size flag; this is useful only when it
precedes -MC (see above) */
- case 'S': smtp_peer_options |=
PEER_OFFERED
_SIZE; break;
+ case 'S': smtp_peer_options |=
OPTION
_SIZE; break;
#ifdef SUPPORT_TLS
/* -MCt: similar to -MCT below but the connection is still open
#ifdef SUPPORT_TLS
/* -MCt: similar to -MCT below but the connection is still open
@@
-2788,7
+2788,7
@@
for (i = 1; i < argc; i++)
precedes -MC (see above). The flag indicates that the host to which
Exim is connected has offered TLS support. */
precedes -MC (see above). The flag indicates that the host to which
Exim is connected has offered TLS support. */
- case 'T': smtp_peer_options |=
PEER_OFFERED
_TLS; break;
+ case 'T': smtp_peer_options |=
OPTION
_TLS; break;
#endif
default: badarg = TRUE; break;
#endif
default: badarg = TRUE; break;
@@
-4132,9
+4132,8
@@
if (((debug_selector & D_any) != 0 || LOGGING(arguments))
quote = US"";
while (*pp != 0) if (isspace(*pp++)) { quote = US"\""; break; }
}
quote = US"";
while (*pp != 0) if (isspace(*pp++)) { quote = US"\""; break; }
}
- sprintf(CS p, " %s%.*s%s", quote, (int)(big_buffer_size -
+
p +=
sprintf(CS p, " %s%.*s%s", quote, (int)(big_buffer_size -
(p - big_buffer) - 4), printing, quote);
(p - big_buffer) - 4), printing, quote);
- while (*p) p++;
}
if (LOGGING(arguments))
}
if (LOGGING(arguments))