Keep all non-error syslog messages on one line per downloaded message.

svn path=/branches/BRANCH_6-3/; revision=4874

diff --git a/NEWS b/NEWS
index ae074d5578b185c9f2ec2a48a6c667e7831c5b77..3b37047d75719fbccc6ce02d61b7e91deba260d6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -98,6 +98,7 @@ fetchmail 6.3.5 (not yet released):
   (undocumented) and non-root users. See also the deprecation warning above.
 * When a connection fails, log not only the IP address, but also host and
   service name.
+* Keep syslog output at one line per message (this works if no errors occur).
 
 # CHANGES:
 * Rename all fetchmail-internal lock_* functions to fm_lock_*. Obsoletes

diff --git a/driver.c b/driver.c
index 8ffd8e98484469549489d893d852ef7bff197634..5d765986bf21b682ede6e04b4ab269a219c844e5 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -615,8 +615,6 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
                                 : GT_(" (%d header octets)"), len);
                if (outlevel >= O_VERBOSE)
                    report_complete(stdout, "\n");
-               else
-                   report_complete(stdout, " ");
            }
 
            /* 
@@ -683,8 +681,8 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
                    if (len == -1)
                        len = msgsize - msgblk.msglen;
                    if (outlevel > O_SILENT && !wholesize)
-                       report_complete(stdout,
-                                       GT_(" (%d body octets) "), len);
+                       report_build(stdout,
+                                       GT_(" (%d body octets)"), len);
                }
 
                /* process the body now */
@@ -776,7 +774,7 @@ flagthemail:
        if (retained)
        {
            if (outlevel > O_SILENT) 
-               report(stdout, GT_(" retained\n"));
+               report_complete(stdout, GT_(" retained\n"));
        }
        else if (ctl->server.base_protocol->delete_msg
                 && !suppress_delete