From 9ebea44a28f0cb90be60e2980df7e0dbb801286d Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Mon, 2 Sep 2002 07:58:04 +0000
Subject: Fix a cvs server bug introduced in 1.11.2, in the words of the
 author: --- Fix communication hanging in communication shutdown phase, caused
 by at least older CVS clients (version < 1.11.2) and a semantically incorrect
 usage of getc() by the server. ---

getc() was being used on a blocking socket/pipe.

Submitted by:   rse
---
 contrib/cvs/src/buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'contrib/cvs/src')

diff --git a/contrib/cvs/src/buffer.c b/contrib/cvs/src/buffer.c
index 0c13cde..9048a9e 100644
--- a/contrib/cvs/src/buffer.c
+++ b/contrib/cvs/src/buffer.c
@@ -1,5 +1,7 @@
 /* Code for the buffer data structure.  */
 
+/* $FreeBSD$ */
+
 #include <assert.h>
 #include "cvs.h"
 #include "buffer.h"
@@ -1378,8 +1380,7 @@ stdio_buffer_shutdown (buf)
 
     if (buf->input)
     {
-	if (! buf_empty_p (buf)
-	    || getc (bc->fp) != EOF)
+	if (! buf_empty_p (buf))
 	{
 # ifdef SERVER_SUPPORT
 	    if (server_active)
-- 
cgit v1.1