Tweak in lexical analysis.

svn path=/trunk/; revision=2764

3 files changed, 3 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index ebd74527..12caa84d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * Only emit progress dots when stdout is connected to a tty.
 * Fix for GNATS bug 16468, "INET6 breaks fetchmail preconnect"
   by Munechika SUMIKAWA <sumikawa@ebina.hitachi.co.jp>.
+* Lexical analyzer now understands that -?[0-9]*[a-zA-Z] is not a number.
 
 fetchmail-5.2.8 (Mon Feb 14 19:16:46 EST 2000), 18571 lines:
 
diff --git a/rcfile_l.l b/rcfile_l.l
index 91b82d88..32e274cc 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -177,7 +177,7 @@ options		{/* EMPTY */}
 
 (#.*)?\\?\n	{ prc_lineno++;	}   /* newline is ignored */
 
--?[0-9]+		{ yylval.number = atoi(yytext); return NUMBER; }
+-?[0-9]+/[^a-zA-Z]	{ yylval.number = atoi(yytext); return NUMBER; }
 
 [^=;:, \t\r\n]+	{
 			char buf[MSGBUFSIZE];
diff --git a/socket.c b/socket.c
index 9501b1eb..3040a5fe 100644
--- a/socket.c
+++ b/socket.c
@@ -669,7 +669,7 @@ int SockClose(int sock)
      * This stops sends but allows receives (effectively, it sends a
      * TCP <FIN>).
      */
-    if (shutdown(sock, 1) == SUCCESS)
+    if (shutdown(sock, 1) == 0)
 	/* If there is any data still waiting in the queue, discard it.
 	 * Call recv() until either it returns 0 (meaning we received a FIN)
 	 * or any error occurs.  This makes sure all data sent by the other