Fixed Paul Sutcliffe's fooup.

svn path=/trunk/; revision=1113

2 files changed, 10 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 7df0b277..8233d2ef 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ pl 3.9.9 ():
 * We can now process multiple To headers a la Microsoft Exchange Server.
 * Avoid sending LIST and getting an error when no messages are waiting.
 * Allow `fetchmail' to do wakeup even when no .fetchmailrc.
+* Fix Paul Sutvliffe's headerless-mail bug.
 
 pl 3.9.8 (Sat Jun 14 14:19:32 EDT 1997):
 * Fetchmail is now normally built with optimization.
diff --git a/driver.c b/driver.c
index 3f5fc649..5d8a0d01 100644
--- a/driver.c
+++ b/driver.c
@@ -1478,25 +1478,25 @@ const struct method *proto;	/* protocol method table */
 		    }
 		    else
 		    {
+			bool wholesize = !protocol->fetch_body;
+
 			/* request a message */
 			ok = (protocol->fetch_headers)(sock, ctl, num, &len);
 			if (ok != 0)
 			    goto cleanUp;
 			set_timeout(ctl->server.timeout);
 
-			if (outlevel > O_SILENT)
+			/* -1 means we didn't see a size in the response */
+			if (len == -1 && msgsizes)
 			{
-			    bool wholesize = !protocol->fetch_body;
+			    len = msgsizes[num - 1];
+			    wholesize = TRUE;
+			}
 
+			if (outlevel > O_SILENT)
+			{
 			    error_build("reading message %d", num);
 
-			    /* -1 means we didn't see a size in the response */
-			    if (len == -1 && msgsizes)
-			    {
-				len = msgsizes[num - 1];
-				wholesize = TRUE;
-			    }
-
  			    if (len > 0)
 				error_build(" (%d %sbytes)",
 					    len, wholesize ? "" : "header ");