===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/make.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/make/make.c	1999/12/18 02:11:27	1.9
--- src/usr.bin/make/make.c	1999/12/18 21:53:32	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: make.c,v 1.9 1999/12/18 02:11:27 espie Exp $	*/
  /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: make.c,v 1.10 1999/12/18 21:53:32 espie Exp $	*/
  /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: make.c,v 1.9 1999/12/18 02:11:27 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: make.c,v 1.10 1999/12/18 21:53:32 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 344,353 ****
  	}
  
  	if (Lst_Open (cgn->children) == SUCCESS) {
! 	    while ((ln = Lst_Next (cgn->children)) != NILLNODE) {
  		gn = (GNode *)Lst_Datum (ln);
  
! 		if (Lst_Member (pgn->children, gn) == NILLNODE) {
  		    (void) Lst_AtEnd (pgn->children, gn);
  		    (void) Lst_AtEnd (gn->parents, pgn);
  		    pgn->unmade += 1;
--- 344,353 ----
  	}
  
  	if (Lst_Open (cgn->children) == SUCCESS) {
! 	    while ((ln = Lst_Next (cgn->children)) != NULL) {
  		gn = (GNode *)Lst_Datum (ln);
  
! 		if (Lst_Member (pgn->children, gn) == NULL) {
  		    (void) Lst_AtEnd (pgn->children, gn);
  		    (void) Lst_AtEnd (gn->parents, pgn);
  		    pgn->unmade += 1;
***************
*** 482,488 ****
      }
  
      if (Lst_Open (cgn->parents) == SUCCESS) {
! 	while ((ln = Lst_Next (cgn->parents)) != NILLNODE) {
  	    pgn = (GNode *)Lst_Datum (ln);
  	    if (pgn->make) {
  		pgn->unmade -= 1;
--- 482,488 ----
      }
  
      if (Lst_Open (cgn->parents) == SUCCESS) {
! 	while ((ln = Lst_Next (cgn->parents)) != NULL) {
  	    pgn = (GNode *)Lst_Datum (ln);
  	    if (pgn->make) {
  		pgn->unmade -= 1;
***************
*** 516,526 ****
       * it means we need to place it in the queue as it restrained itself
       * before.
       */
!     for (ln = Lst_First(cgn->successors); ln != NILLNODE; ln = Lst_Succ(ln)) {
  	GNode	*succ = (GNode *)Lst_Datum(ln);
  
  	if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&
! 	    Lst_Member(toBeMade, (ClientData)succ) == NILLNODE)
  	{
  	    (void)Lst_EnQueue(toBeMade, (ClientData)succ);
  	}
--- 516,526 ----
       * it means we need to place it in the queue as it restrained itself
       * before.
       */
!     for (ln = Lst_First(cgn->successors); ln != NULL; ln = Lst_Succ(ln)) {
  	GNode	*succ = (GNode *)Lst_Datum(ln);
  
  	if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&
! 	    Lst_Member(toBeMade, (ClientData)succ) == NULL)
  	{
  	    (void)Lst_EnQueue(toBeMade, (ClientData)succ);
  	}
***************
*** 533,539 ****
      if (Lst_Open (cgn->iParents) == SUCCESS) {
  	char	*cpref = Var_Value(PREFIX, cgn);
  
! 	while ((ln = Lst_Next (cgn->iParents)) != NILLNODE) {
  	    pgn = (GNode *)Lst_Datum (ln);
  	    if (pgn->make) {
  		Var_Set (IMPSRC, cname, pgn);
--- 533,539 ----
      if (Lst_Open (cgn->iParents) == SUCCESS) {
  	char	*cpref = Var_Value(PREFIX, cgn);
  
! 	while ((ln = Lst_Next (cgn->iParents)) != NULL) {
  	    pgn = (GNode *)Lst_Datum (ln);
  	    if (pgn->make) {
  		Var_Set (IMPSRC, cname, pgn);
***************
*** 685,691 ****
  	if (!Lst_IsEmpty(gn->preds)) {
  	    LstNode ln;
  
! 	    for (ln = Lst_First(gn->preds); ln != NILLNODE; ln = Lst_Succ(ln)){
  		GNode	*pgn = (GNode *)Lst_Datum(ln);
  
  		if (pgn->make && pgn->made == UNMADE) {
--- 685,691 ----
  	if (!Lst_IsEmpty(gn->preds)) {
  	    LstNode ln;
  
! 	    for (ln = Lst_First(gn->preds); ln != NULL; ln = Lst_Succ(ln)){
  		GNode	*pgn = (GNode *)Lst_Datum(ln);
  
  		if (pgn->make && pgn->made == UNMADE) {
***************
*** 696,707 ****
  		}
  	    }
  	    /*
! 	     * If ln isn't nil, there's a predecessor as yet unmade, so we
  	     * just drop this node on the floor. When the node in question
  	     * has been made, it will notice this node as being ready to
  	     * make but as yet unmade and will place the node on the queue.
  	     */
! 	    if (ln != NILLNODE) {
  		continue;
  	    }
  	}
--- 696,707 ----
  		}
  	    }
  	    /*
! 	     * If ln isn't null, there's a predecessor as yet unmade, so we
  	     * just drop this node on the floor. When the node in question
  	     * has been made, it will notice this node as being ready to
  	     * make but as yet unmade and will place the node on the queue.
  	     */
! 	    if (ln != NULL) {
  		continue;
  	    }
  	}