From 338b31a37567fb4e66d4918d3261ab3dbde05055 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 10 Feb 1997 09:33:43 +0000
Subject: [PATCH] Various minor bugfixes.

svn path=/trunk/; revision=859
---
 NEWS        | 18 ++++++++++++++++++
 driver.c    |  5 ++---
 fetchmail.c |  2 +-
 pop3.c      |  2 +-
 rcfile_l.l  |  2 +-
 uid.c       |  1 +
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 54c9e35d..5bd5d13d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,24 @@
 			Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-3.4 ()
+
+features --
+
+bugs --
+
+* The bug that displayed incorrect sizes for POP3 connections has been fixed.
+
+* Upped the %a option in the lexer file so SunOS 4.1.3 lex won't choke with a
+  "Too Many Transitions" error.
+
+* Size-ticker dots are now disabled when verbose is on.  This should eliminate
+  some alarming but harmless "(message incomplete)" messages from the
+  error-logging machinery.
+
+There are 220 people on the fetchmail-friends list.
+
+------------------------------------------------------------------------------\
 
 pl 3.3.2 (Mon Feb  3 12:59:33 EST 1997):
 * Minor fixes to stripcr and password-shrouding logic.
diff --git a/driver.c b/driver.c
index a9f868b2..9ab322df 100644
--- a/driver.c
+++ b/driver.c
@@ -451,13 +451,12 @@ char *realname;		/* real name of host */
 	    ((ch = SockPeek(sockfp)) == ' ' || ch == '\t');
 
 	/* write the message size dots */
-	if ((n = strlen(line)) > 0)
+	if ((outlevel>O_SILENT && outlevel<O_VERBOSE) && (n=strlen(line)) > 0)
 	{
 	    sizeticker += n;
 	    while (sizeticker >= SIZETICKER)
 	    {
-		if (outlevel > O_SILENT)
-		    error_build(".");
+		error_build(".");
 		sizeticker -= SIZETICKER;
 	    }
 	}
diff --git a/fetchmail.c b/fetchmail.c
index 39f70074..1a2dc8dc 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -233,7 +233,7 @@ int main (int argc, char **argv)
 	if (check_only)
 	{
 	    fprintf(stderr,
-		 "fetchmail: can't check mail while another fetchmail to same host is running.");
+		 "fetchmail: can't check mail while another fetchmail to same host is running.\n");
 	    return(PS_EXCLUDE);
         }
 	else if (!implicitmode)
diff --git a/pop3.c b/pop3.c
index 72232260..bf91bc92 100644
--- a/pop3.c
+++ b/pop3.c
@@ -243,7 +243,7 @@ static int pop3_fetch(FILE *sockfp, struct query *ctl, int number, int *lenp)
 	*lenp = 0;
     else
     {
-	while (--cp > buf && isdigit(*cp))
+	while (--cp >= buf && isdigit(*cp))
 	    continue;
 	*lenp = atoi(++cp);
     }
diff --git a/rcfile_l.l b/rcfile_l.l
index 059b07c2..9a7f33fc 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -15,7 +15,7 @@ int prc_lineno = 1;
 
 /* this doesn't work with Linux lex, see the INSTALL file */
 %o 5000
-%a 3000
+%a 4000
 
 WS	[ \t]*
 
diff --git a/uid.c b/uid.c
index 32aa0b36..9dd1979c 100644
--- a/uid.c
+++ b/uid.c
@@ -145,6 +145,7 @@ void save_str_pair(struct idlist **idl, const char *str1, const char *str2)
 	(*end)->val.id2 = xstrdup(str2);
     else
 	(*end)->val.id2 = (char *)NULL;
+    (*end)->next = (char *)NULL;
 }
 
 #ifdef __UNUSED__
-- 
2.43.2