===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff_internals.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- src/usr.bin/cvs/diff_internals.c	2009/06/07 08:39:13	1.28
+++ src/usr.bin/cvs/diff_internals.c	2010/07/15 11:10:23	1.29
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff_internals.c,v 1.28 2009/06/07 08:39:13 ray Exp $	*/
+/*	$OpenBSD: diff_internals.c,v 1.29 2010/07/15 11:10:23 ray Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -430,13 +430,12 @@
 	for (;;) {
 		i = fread(buf1, 1, sizeof(buf1), f1);
 		j = fread(buf2, 1, sizeof(buf2), f2);
+		if ((!i && ferror(f1)) || (!j && ferror(f2)))
+			return (-1);
 		if (i != j)
 			return (1);
-		if (i == 0 && j == 0) {
-			if (ferror(f1) || ferror(f2))
-				return (1);
+		if (i == 0)
 			return (0);
-		}
 		if (memcmp(buf1, buf2, i) != 0)
 			return (1);
 	}