Fix Johan Vromans's keep bug.

svn path=/trunk/; revision=336

2 files changed, 10 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index afa99ee6..02cde875 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,10 @@ bugs --
 
 * Accept RFC822 headers with a tab after the colon.
 
+* You now see a "skipping" message for each message not retrieved.
+
+* --keep no longer overrides --flush.
+
 fetchmail-1.8 (Fri Oct 11 15:08:10 EDT 1996):
 
 features --
diff --git a/driver.c b/driver.c
index 715607e3..594f39ae 100644
--- a/driver.c
+++ b/driver.c
@@ -693,12 +693,13 @@ struct method *proto;
 	/* read, forward, and delete messages */
 	for (num = 1; num <= count; num++)
 	{
-	    int	treat_as_new = 
-		!protocol->is_old 
-		|| !(protocol->is_old)(socket, queryctl, num);
+	    int	fetch_it = queryctl->fetchall ||
+		!(protocol->is_old && (protocol->is_old)(socket,queryctl,num));
 
 	    /* we may want to reject this message if it's old */
-	    if (treat_as_new || queryctl->fetchall)
+	    if (!fetch_it)
+		fprintf(stderr, "skipping message %d ", num);
+	    else
 	    {
 		int	saveduid = getuid();
 
@@ -771,8 +772,7 @@ struct method *proto;
 
 	    /* maybe we delete this message now? */
 	    if (protocol->delete
-		&& !queryctl->keep
-		&& (treat_as_new || queryctl->flush))
+		&& (fetch_it ? !queryctl->keep : queryctl->flush))
 	    {
 		deletions++;
 		if (outlevel > O_SILENT && outlevel < O_VERBOSE)