Output newline after list of message IDs output by "-Mxxx" operations

diff --git a/src/src/exim.c b/src/src/exim.c
index 3290d63465b334be55a151c2fbc8737aa3d8287c..6a2e7a644b7e9639ddf8f3acc5700c57216236fb 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -4300,6 +4300,11 @@ if (msg_action_arg > 0 && msg_action != MSG_DELIVER && msg_action != MSG_LOAD)
     for (i = msg_action_arg; i < argc; i++)
       if (!queue_action(argv[i], msg_action, NULL, 0, 0))
         yield = EXIT_FAILURE;
     for (i = msg_action_arg; i < argc; i++)
       if (!queue_action(argv[i], msg_action, NULL, 0, 0))
         yield = EXIT_FAILURE;

+    switch (msg_action)
+      {
+      case MSG_REMOVE: MSG_DELETE: case MSG_FREEZE: case MSG_THAW: break;
+      default: printf("\n"); break;
+      }

     }
 
   else if (!queue_action(argv[msg_action_arg], msg_action, argv, argc,
     }
 
   else if (!queue_action(argv[msg_action_arg], msg_action, argv, argc,

diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index becd160569d16f3b024bffdbe47c6d0ee7dea3e8..ddf17f8d9550d9f029948b724bdecfa532629d82 100644 (file)
--- a/test/scripts/0000-Basic/0576
+++ b/test/scripts/0000-Basic/0576
@@ -74,6 +74,7 @@ exim -q
 #
 #
 # Native queue transfer
 #
 #
 # Native queue transfer

+### load messages

 exim -bs
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 exim -bs
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>


@@ -92,8 +93,10 @@ foo
 .
 QUIT
 ****
 .
 QUIT
 ****

+### default q

 exim -bp
 ****
 exim -bp
 ****

+### alternate q

 exim -bp -qGalternate
 ****
 #
 exim -bp -qGalternate
 ****
 #


@@ -101,14 +104,18 @@ exim -MG third $msg1
 ****
 exim -qGalternate -MG third $msg1
 ****
 ****
 exim -qGalternate -MG third $msg1
 ****

+### third q

 exim -bp -qGthird
 ****
 exim -qGthird -MG '' $msg1 $msg2
 ****
 exim -bp -qGthird
 ****
 exim -qGthird -MG '' $msg1 $msg2
 ****

+### default q

 exim -bp
 ****
 exim -bp
 ****

+### alternate q

 exim -bp -qGalternate
 ****
 exim -bp -qGalternate
 ****

+### third q

 exim -bp -qGthird
 ****
 #
 exim -bp -qGthird
 ****
 #

diff --git a/test/stdout/0576 b/test/stdout/0576
index 91c57a20d989ad8982b5d2eda4d05bf9d0f3f62b..0a0e014eeb77708025b6366c2e0af22800151968 100644 (file)
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -29,6 +29,7 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbA-0005vi-00\r
 221 the.local.host.name closing connection\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbA-0005vi-00\r
 221 the.local.host.name closing connection\r

+### load messages

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r


@@ -40,25 +41,41 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbC-0005vi-00\r
 221 the.local.host.name closing connection\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbC-0005vi-00\r
 221 the.local.host.name closing connection\r

+### default q

  0m   sss 10HmbB-0005vi-00 <CALLER@the.local.host.name>
           normal@test.ex
 
  0m   sss 10HmbB-0005vi-00 <CALLER@the.local.host.name>
           normal@test.ex
 

+### alternate q

  0m   sss 10HmbC-0005vi-00 <CALLER@the.local.host.name>
           alternate@test.ex
 
  0m   sss 10HmbC-0005vi-00 <CALLER@the.local.host.name>
           alternate@test.ex
 

-Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00  0m   323 10HmbB-0005vi-00 <CALLER@the.local.host.name>
+Message 10HmbB-0005vi-00 
+Message 10HmbC-0005vi-00 
+### third q
+ 0m   sss 10HmbB-0005vi-00 <CALLER@the.local.host.name>

           normal@test.ex
 
  0m   sss 10HmbC-0005vi-00 <CALLER@the.local.host.name>
           alternate@test.ex
 
           normal@test.ex
 
  0m   sss 10HmbC-0005vi-00 <CALLER@the.local.host.name>
           alternate@test.ex
 

-Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00  0m   323 10HmbB-0005vi-00 <CALLER@the.local.host.name>
+Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00 
+### default q
+ 0m   sss 10HmbB-0005vi-00 <CALLER@the.local.host.name>

           normal@test.ex
 
  0m   sss 10HmbC-0005vi-00 <CALLER@the.local.host.name>
           alternate@test.ex
 
           normal@test.ex
 
  0m   sss 10HmbC-0005vi-00 <CALLER@the.local.host.name>
           alternate@test.ex
 

+### alternate q
+### third q

 
 ******** SERVER ********
 ### default q
 ### alternate q
 
 ******** SERVER ********
 ### default q
 ### alternate q

+### load messages
+### default q
+### alternate q
+### third q
+### default q
+### alternate q
+### third q