rel 20; rediff patches

[packages/cvs.git] / cvs-fixed_buffer.patch

--- cvs/src/buffer.h.org	2007-11-05 20:50:00.611456571 +0100
+++ cvs/src/buffer.h	2007-11-05 20:50:11.485304127 +0100
@@ -16,6 +16,8 @@
 
 #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
 
+# include <unistd.h>
+
 # include "getpagesize.h"
 
 /*
diff -ur cvs-1.11.1p1.orig/src/buffer.c cvs-1.11.1p1/src/buffer.c
--- cvs-1.11.1p1.orig/src/buffer.c	Thu Apr 19 21:29:05 2001
+++ cvs-1.11.1p1/src/buffer.c	Thu Feb 14 13:22:23 2002
@@ -292,15 +293,28 @@
 
 	    if (nbytes != data->size)
 	    {
+	    	struct buffer_data *p;
+		int cnt;
+		
 		/* Not all the data was written out.  This is only
                    permitted in nonblocking mode.  Adjust the buffer,
                    and return.  */
 
 		assert (buf->nonblocking);
 
+		cnt = 0;
+		for (p = data; p->next; p = p->next)
+			cnt++;
+
 		data->size -= nbytes;
 		data->bufp += nbytes;
 
+		/* Don't allow buffers to grow over 100 pages. */
+		if (cnt > 100) {
+			usleep(100000);
+			continue;
+		}
+			
 		return 0;
 	    }
 	}