Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.bin/make/cond.c,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/make/cond.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.26
retrieving revision 1.28
diff -u -p -r1.26 -r1.28
--- src/usr.bin/make/cond.c	2005/03/01 04:34:55	1.26
+++ src/usr.bin/make/cond.c	2005/07/25 22:55:58	1.28
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.26 2005/03/01 04:34:55 christos Exp $	*/
+/*	$NetBSD: cond.c,v 1.28 2005/07/25 22:55:58 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.26 2005/03/01 04:34:55 christos Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.28 2005/07/25 22:55:58 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.26 2005/03/01 04:34:55 christos Exp $");
+__RCSID("$NetBSD: cond.c,v 1.28 2005/07/25 22:55:58 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -707,6 +707,7 @@ CondToken(Boolean doEval)
 		Boolean lhsQuoted;
 		Boolean rhsQuoted;
 
+		rhs = NULL;
 		lhsFree = rhsFree = FALSE;
 		lhsQuoted = rhsQuoted = FALSE;
 		
@@ -1074,7 +1075,7 @@ CondF(Boolean doEval)
 	    if (l == True) {
 		l = CondF(doEval);
 	    } else {
-		(void) CondF(FALSE);
+		(void)CondF(FALSE);
 	    }
 	} else {
 	    /*
@@ -1121,7 +1122,7 @@ CondE(Boolean doEval)
 	    if (l == False) {
 		l = CondE(doEval);
 	    } else {
-		(void) CondE(FALSE);
+		(void)CondE(FALSE);
 	    }
 	} else {
 	    /*