===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/make/main.c	1999/12/18 02:11:27	1.24
--- src/usr.bin/make/main.c	1999/12/18 21:53:32	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.24 1999/12/18 02:11:27 espie Exp $	*/
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.25 1999/12/18 21:53:32 espie Exp $	*/
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
***************
*** 49,55 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.24 1999/12/18 02:11:27 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 49,55 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.25 1999/12/18 21:53:32 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 662,668 ****
  	Targ_Init();
  	Suff_Init();
  
! 	DEFAULT = NILGNODE;
  	(void)time(&now);
  
  	/*
--- 662,668 ----
  	Targ_Init();
  	Suff_Init();
  
! 	DEFAULT = NULL;
  	(void)time(&now);
  
  	/*
***************
*** 673,679 ****
  	if (!Lst_IsEmpty(create)) {
  		LstNode ln;
  
! 		for (ln = Lst_First(create); ln != NILLNODE;
  		    ln = Lst_Succ(ln)) {
  			char *name = (char *)Lst_Datum(ln);
  
--- 673,679 ----
  	if (!Lst_IsEmpty(create)) {
  		LstNode ln;
  
! 		for (ln = Lst_First(create); ln != NULL;
  		    ln = Lst_Succ(ln)) {
  			char *name = (char *)Lst_Datum(ln);
  
***************
*** 714,720 ****
  		if (Lst_IsEmpty(sysMkPath))
  			Fatal("make: no system rules (%s).", _PATH_DEFSYSMK);
  		ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
! 		if (ln != NILLNODE)
  			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
  	}
  
--- 714,720 ----
  		if (Lst_IsEmpty(sysMkPath))
  			Fatal("make: no system rules (%s).", _PATH_DEFSYSMK);
  		ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
! 		if (ln != NULL)
  			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
  	}
  
***************
*** 722,728 ****
  		LstNode ln;
  
  		ln = Lst_Find(makefiles, (ClientData)NULL, ReadMakefile);
! 		if (ln != NILLNODE)
  			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
  	} else if (!ReadMakefile("BSDmakefile", NULL))
  		if (!ReadMakefile("makefile", NULL))
--- 722,728 ----
  		LstNode ln;
  
  		ln = Lst_Find(makefiles, (ClientData)NULL, ReadMakefile);
! 		if (ln != NULL)
  			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
  	} else if (!ReadMakefile("BSDmakefile", NULL))
  		if (!ReadMakefile("makefile", NULL))
***************
*** 786,792 ****
  	if (printVars) {
  		LstNode ln;
  
! 		for (ln = Lst_First(variables); ln != NILLNODE;
  		    ln = Lst_Succ(ln)) {
  			char *value = Var_Value((char *)Lst_Datum(ln),
  					  VAR_GLOBAL);
--- 786,792 ----
  	if (printVars) {
  		LstNode ln;
  
! 		for (ln = Lst_First(variables); ln != NULL;
  		    ln = Lst_Succ(ln)) {
  			char *value = Var_Value((char *)Lst_Datum(ln),
  					  VAR_GLOBAL);