From 3043f194879fa7fe42736df9523a67088deed806 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 1 Aug 2006 00:06:36 +0000 Subject: Keep all non-error syslog messages on one line per downloaded message. svn path=/branches/BRANCH_6-3/; revision=4874 --- NEWS | 1 + driver.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index ae074d55..3b37047d 100644 --- 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 8ffd8e98..5d765986 100644 --- 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 -- cgit v1.2.3