X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/7596f24296bffbb02eeb7e13b6580d67ccaf798e..462e2cd30639a1b0e9c7d9d08d70e124a147531b:/src/src/smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 3fe3dab82..752e80dca 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2,8 +2,8 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for handling an incoming SMTP call. */
@@ -840,12 +840,8 @@ while (chunking_data_left)
   }
 
 bdat_pop_receive_functions();
-
-if (chunking_state != CHUNKING_LAST)
-  {
-  chunking_state = CHUNKING_OFFERED;
-  DEBUG(D_receive) debug_printf("chunking state %d\n", (int)chunking_state);
-  }
+chunking_state = CHUNKING_OFFERED;
+DEBUG(D_receive) debug_printf("chunking state %d\n", (int)chunking_state);
 }
 
 
@@ -956,15 +952,12 @@ that we'll never expand it. */
 yield = !! string_vformat(&gs, SVFMT_TAINT_NOCHK, format, ap);
 string_from_gstring(&gs);
 
-DEBUG(D_receive)
-  {
-  uschar *msg_copy, *cr, *end;
-  msg_copy = string_copy(gs.s);
-  end = msg_copy + gs.ptr;
-  while ((cr = Ustrchr(msg_copy, '\r')) != NULL)   /* lose CRs */
-    memmove(cr, cr + 1, (end--) - cr);
-  debug_printf("SMTP>> %s", msg_copy);
-  }
+DEBUG(D_receive) for (const uschar * t, * s = gs.s;
+		      s && (t = Ustrchr(s, '\r'));
+		      s = t + 2)				/* \r\n */
+    debug_printf("%s %.*s\n",
+		  s == gs.s ? "SMTP>>" : "      ",
+		  (int)(t - s), s);
 
 if (!yield)
   {
@@ -981,7 +974,7 @@ which sometimes uses smtp_printf() and sometimes smtp_respond(). */
 
 if (fl.rcpt_in_progress)
   {
-  if (rcpt_smtp_response == NULL)
+  if (!rcpt_smtp_response)
     rcpt_smtp_response = string_copy(big_buffer);
   else if (fl.rcpt_smtp_response_same &&
            Ustrcmp(rcpt_smtp_response, big_buffer) != 0)
@@ -4622,15 +4615,12 @@ while (done <= 0)
 #endif
 	(void) fwrite(g->s, 1, g->ptr, smtp_out);
 
-      DEBUG(D_receive)
-	{
-	uschar *cr;
-
-	(void) string_from_gstring(g);
-	while ((cr = Ustrchr(g->s, '\r')) != NULL)   /* lose CRs */
-	  memmove(cr, cr + 1, (g->ptr--) - (cr - g->s));
-	debug_printf("SMTP>> %s", g->s);
-	}
+      DEBUG(D_receive) for (const uschar * t, * s = string_from_gstring(g);
+			    s && (t = Ustrchr(s, '\r'));
+			    s = t + 2)				/* \r\n */
+	  debug_printf("%s %.*s\n",
+			s == g->s ? "SMTP>>" : "      ",
+			(int)(t - s), s);
       fl.helo_seen = TRUE;
 
       /* Reset the protocol and the state, abandoning any previous message. */
@@ -5087,7 +5077,7 @@ while (done <= 0)
       count this as a protocol error. Reset was_rej_mail so that further RCPTs
       get the same treatment. */
 
-      if (sender_address == NULL)
+      if (!sender_address)
 	{
 	if (f.smtp_in_pipelining_advertised && last_was_rej_mail)
 	  {
@@ -5106,7 +5096,7 @@ while (done <= 0)
 
       /* Check for an operand */
 
-      if (smtp_cmd_data[0] == 0)
+      if (!smtp_cmd_data[0])
 	{
 	done = synprot_error(L_smtp_syntax_error, 501, NULL,
 	  US"RCPT must have an address operand");
@@ -5834,7 +5824,7 @@ while (done <= 0)
 	etrn_command = smtp_etrn_command;
 	deliver_domain = smtp_cmd_data;
 	rc = transport_set_up_command(&argv, smtp_etrn_command, TRUE, 0, NULL,
-	  US"ETRN processing", &error);
+	  FALSE, US"ETRN processing", &error);
 	deliver_domain = NULL;
 	if (!rc)
 	  {