[exim-cvs] Output newline after list of message IDs output b…

Gitweb: https://git.exim.org/exim.git/commitdiff/11ce40d8d043155bc87a5f564c9064e06fc4f184

Commit:     11ce40d8d043155bc87a5f564c9064e06fc4f184
Parent:     bc062cd5d29c98fce2117533eaa2d811e4dc57d0
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Oct 25 11:18:25 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Oct 25 11:18:25 2019 +0100

    Output newline after list of message IDs output by "-Mxxx" operations
---
 src/src/exim.c               |  5 +++++
 test/scripts/0000-Basic/0576 |  7 +++++++
 test/stdout/0576             | 21 +++++++++++++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/src/exim.c b/src/src/exim.c
index 3290d63..6a2e7a6 100644
--- 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;
+    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,
diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index becd160..ddf17f8 100644
--- a/test/scripts/0000-Basic/0576
+++ b/test/scripts/0000-Basic/0576
@@ -74,6 +74,7 @@ exim -q
 #
 #
 # Native queue transfer
+### load messages
 exim -bs
 MAIL FROM:<CALLER@???>
 RCPT TO: <normal@???>
@@ -92,8 +93,10 @@ foo
 .
 QUIT
 ****
+### default q
 exim -bp
 ****
+### alternate q
 exim -bp -qGalternate
 ****
 #
@@ -101,14 +104,18 @@ exim -MG third $msg1
 ****
 exim -qGalternate -MG third $msg1
 ****
+### third q
 exim -bp -qGthird
 ****
 exim -qGthird -MG '' $msg1 $msg2
 ****
+### default q
 exim -bp
 ****
+### alternate q
 exim -bp -qGalternate
 ****
+### third q
 exim -bp -qGthird
 ****
 #
diff --git a/test/stdout/0576 b/test/stdout/0576
index 91c57a2..0a0e014 100644
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -29,6 +29,7 @@
 354 Enter message, ending with "." on a line by itself
 250 OK id=10HmbA-0005vi-00
 221 the.local.host.name closing connection
+### load messages
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 250 OK
 250 Accepted
@@ -40,25 +41,41 @@
 354 Enter message, ending with "." on a line by itself
 250 OK id=10HmbC-0005vi-00
 221 the.local.host.name closing connection
+### default q
  0m   sss 10HmbB-0005vi-00 <CALLER@???>
           normal@???

+### alternate q
  0m   sss 10HmbC-0005vi-00 <CALLER@???>
           alternate@???

-Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00  0m   323 10HmbB-0005vi-00 <CALLER@???>
+Message 10HmbB-0005vi-00 
+Message 10HmbC-0005vi-00 
+### third q
+ 0m   sss 10HmbB-0005vi-00 <CALLER@???>
           normal@???

  0m   sss 10HmbC-0005vi-00 <CALLER@???>
           alternate@???

-Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00  0m   323 10HmbB-0005vi-00 <CALLER@???>
+Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00 
+### default q
+ 0m   sss 10HmbB-0005vi-00 <CALLER@???>
           normal@???

  0m   sss 10HmbC-0005vi-00 <CALLER@???>
           alternate@???

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

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