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
Tidies to SMTP dialogue debugging output.
[exim.git]
/
src
/
src
/
smtp_in.c
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index 224eba9f7a858611cd6e264f2d7236762b334662..1ed5183a6341f08d6454a4f94e43cc159be3ec34 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/smtp_in.c,v 1.3
5 2006/03/06 16:05:12
ph10 Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.3
6 2006/03/08 10:49:18
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-338,8
+338,13
@@
va_list ap;
DEBUG(D_receive)
{
DEBUG(D_receive)
{
+ uschar *cr, *end;
va_start(ap, format);
(void) string_vformat(big_buffer, big_buffer_size, format, ap);
va_start(ap, format);
(void) string_vformat(big_buffer, big_buffer_size, format, ap);
+ va_end(ap);
+ end = big_buffer + Ustrlen(big_buffer);
+ while ((cr = Ustrchr(big_buffer, '\r')) != NULL) /* lose CRs */
+ memmove(cr, cr + 1, (end--) - cr);
debug_printf("SMTP>> %s", big_buffer);
}
debug_printf("SMTP>> %s", big_buffer);
}
@@
-2643,7
+2648,13
@@
while (done <= 0)
#endif
(void)fwrite(s, 1, ptr, smtp_out);
#endif
(void)fwrite(s, 1, ptr, smtp_out);
- DEBUG(D_receive) debug_printf("SMTP>> %s", s);
+ DEBUG(D_receive)
+ {
+ uschar *cr;
+ while ((cr = Ustrchr(s, '\r')) != NULL) /* lose CRs */
+ memmove(cr, cr + 1, (ptr--) - (cr - s));
+ debug_printf("SMTP>> %s", s);
+ }
helo_seen = TRUE;
break; /* HELO/EHLO */
helo_seen = TRUE;
break; /* HELO/EHLO */