Loading...
stdio/FreeBSD/fread.c.patch /dev/null Libc-594.9.5
--- /dev/null
+++ Libc/Libc-594.9.5/stdio/FreeBSD/fread.c.patch
@@ -0,0 +1,86 @@
+--- fread.c.orig	2008-08-29 21:58:50.000000000 -0700
++++ fread.c	2008-09-02 02:18:06.000000000 -0700
+@@ -55,7 +55,7 @@ fread(buf, size, count, fp)
+ {
+ 	size_t resid;
+ 	char *p;
+-	int r;
++	int r, ret;
+ 	size_t total;
+ 
+ 	/*
+@@ -71,21 +71,70 @@ fread(buf, size, count, fp)
+ 		fp->_r = 0;
+ 	total = resid;
+ 	p = buf;
++	/* first deal with anything left in buffer, plus any ungetc buffers */
+ 	while (resid > (r = fp->_r)) {
+ 		(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
+ 		fp->_p += r;
+ 		/* fp->_r = 0 ... done in __srefill */
+ 		p += r;
+ 		resid -= r;
+-		if (__srefill(fp)) {
++		if ((ret = __srefill0(fp)) > 0)
++			break;
++		else if (ret) {
+ 			/* no more input: return partial result */
+ 			FUNLOCKFILE(fp);
+ 			return ((total - resid) / size);
+ 		}
+ 	}
+-	(void)memcpy((void *)p, (void *)fp->_p, resid);
+-	fp->_r -= resid;
+-	fp->_p += resid;
++	/*
++	 * 5980080: don't use optimization if __SMBF not set (meaning setvbuf
++	 * was called, and the buffer belongs to the user).
++	 * 6180417: but for unbuffered (__SMBF is not set), so specifically
++	 * test for it.
++	 */
++	if ((fp->_flags & (__SMBF | __SNBF)) && resid > fp->_bf._size) {
++		struct __sbuf save;
++		size_t n;
++
++		save = fp->_bf;
++		fp->_bf._base = p;
++		fp->_bf._size = resid;
++		while (fp->_bf._size > 0) {
++			if ((ret = __srefill1(fp)) != 0) {
++				/* no more input: return partial result */
++				resid = fp->_bf._size;
++				fp->_bf = save;
++				fp->_p = fp->_bf._base;
++				/* fp->_r = 0;  already set in __srefill1 */
++				FUNLOCKFILE(fp);
++				return ((total - resid) / size);
++			}
++			fp->_bf._base += fp->_r;
++			fp->_bf._size -= fp->_r;
++		}
++		fp->_bf = save;
++		n = fp->_bf._size * ((resid - 1) / fp->_bf._size);
++		r = resid - n;
++		(void)memcpy((void *)fp->_bf._base, (void *)(p + n), (size_t)r);
++		fp->_p = fp->_bf._base + r;
++		fp->_r = 0;
++	} else {
++		while (resid > (r = fp->_r)) {
++			(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
++			fp->_p += r;
++			/* fp->_r = 0 ... done in __srefill */
++			p += r;
++			resid -= r;
++			if (__srefill1(fp)) {
++				/* no more input: return partial result */
++				FUNLOCKFILE(fp);
++				return ((total - resid) / size);
++			}
++		}
++		(void)memcpy((void *)p, (void *)fp->_p, resid);
++		fp->_r -= resid;
++		fp->_p += resid;
++	}
+ 	FUNLOCKFILE(fp);
+ 	return (count);
+ }