From 76fd18d1d11e5457a3a34c5d7fbe077b8c9f7a10 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 26 Feb 2010 00:51:00 +0100
Subject: Fix verbose mode progress formatting regression from 6.3.10.
---
NEWS | 2 ++
sink.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/NEWS b/NEWS
index a8984127..32807eef 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,8 @@ fetchmail 6.3.15 (not yet released):
January 1997. Reported by Frédéric Marchal.
* Do not close stdout when using mda and "bsmtp -" at the same time.
* Log operating system errors when BSMTP writes fail.
+* Fix verbose mode progress formatting regression from 6.3.10; SMTP trace lines
+ were no longer on a line of their own. Reported by Melchior Franz.
# CHANGES
* The repository has been converted and moved from the Subversion (SVN) format
diff --git a/sink.c b/sink.c
index a7a2820e..e1f008c9 100644
--- a/sink.c
+++ b/sink.c
@@ -1269,6 +1269,8 @@ int open_sink(struct query *ctl, struct msgblk *msg,
{
*bad_addresses = *good_addresses = 0;
+ if (want_progress() && outlevel >= O_VERBOSE && !ctl->mda && !ctl->bsmtp) puts("");
+
if (ctl->bsmtp) /* dump to a BSMTP batch file */
return(open_bsmtp_sink(ctl, msg, good_addresses, bad_addresses));
/*
@@ -1348,6 +1350,8 @@ int close_sink(struct query *ctl, struct msgblk *msg, flag forward)
{
int smtp_err;
+ if (want_progress() && outlevel >= O_VERBOSE && !ctl->mda && !ctl->bsmtp) puts("");
+
if (ctl->bsmtp && sinkfp) {
int error, oerrno;
--
cgit v1.2.3