===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3prog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/diff3/diff3prog.c	2003/07/14 17:43:52	1.2
+++ src/usr.bin/diff3/diff3prog.c	2003/10/24 20:32:06	1.3
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3prog.c,v 1.2 2003/07/14 17:43:52 deraadt Exp $	*/
+/*	$OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -71,7 +71,7 @@
 #endif /* not lint */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.2 2003/07/14 17:43:52 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -450,7 +450,7 @@
 	int j, n;
 
 	for (n = 0; cline[i] < from - 1; n += j) {
-		if ((j = getline(fp[i])) == NULL)
+		if ((j = getline(fp[i])) == 0)
 			trouble();
 		if (pr != NULL)
 			printf("%s%s", pr, line);