===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/make/compat.c	2000/02/02 13:47:47	1.22
--- src/usr.bin/make/compat.c	2000/03/26 16:21:32	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: compat.c,v 1.22 2000/02/02 13:47:47 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: compat.c,v 1.23 2000/03/26 16:21:32 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: compat.c,v 1.22 2000/02/02 13:47:47 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: compat.c,v 1.23 2000/03/26 16:21:32 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 122,128 ****
  	if (signo == SIGINT) {
  	    gn = Targ_FindNode(".INTERRUPT", TARG_NOCREATE);
  	    if (gn != NULL) {
! 		Lst_ForEach(gn->commands, CompatRunCommand, (ClientData)gn);
  	    }
  	}
  
--- 122,128 ----
  	if (signo == SIGINT) {
  	    gn = Targ_FindNode(".INTERRUPT", TARG_NOCREATE);
  	    if (gn != NULL) {
! 		Lst_ForEach(gn->commands, CompatRunCommand, gn);
  	    }
  	}
  
***************
*** 232,238 ****
      silent = gn->type & OP_SILENT;
      errCheck = !(gn->type & OP_IGNORE);
  
!     cmdNode = Lst_Member (gn->commands, (ClientData)cmd);
      cmdStart = Var_Subst(cmd, gn, FALSE);
  
      /*
--- 232,238 ----
      silent = gn->type & OP_SILENT;
      errCheck = !(gn->type & OP_IGNORE);
  
!     cmdNode = Lst_Member(gn->commands, cmd);
      cmdStart = Var_Subst(cmd, gn, FALSE);
  
      /*
***************
*** 249,258 ****
      } else {
  	cmd = cmdStart;
      }
!     Lst_Replace (cmdNode, (ClientData)cmdStart);
  
      if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
! 	Lst_AtEnd(ENDNode->commands, (ClientData)cmdStart);
  	return(0);
      } else if (strcmp(cmdStart, "...") == 0) {
  	gn->type |= OP_SAVE_CMDS;
--- 249,258 ----
      } else {
  	cmd = cmdStart;
      }
!     Lst_Replace(cmdNode, cmdStart);
  
      if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
! 	Lst_AtEnd(ENDNode->commands, cmdStart);
  	return(0);
      } else if (strcmp(cmdStart, "...") == 0) {
  	gn->type |= OP_SAVE_CMDS;
***************
*** 363,369 ****
  	free(bp);
      }
      free(cmdStart);
!     Lst_Replace(cmdNode, (ClientData)NULL);
  
      /*
       * The child is off and running. Now all we can do is wait...
--- 363,369 ----
  	free(bp);
      }
      free(cmdStart);
!     Lst_Replace(cmdNode, NULL);
  
      /*
       * The child is off and running. Now all we can do is wait...
***************
*** 459,465 ****
  	gn->make = TRUE;
  	gn->made = BEINGMADE;
  	Suff_FindDeps (gn);
! 	Lst_ForEach (gn->children, CompatMake, (ClientData)gn);
  	if (!gn->make) {
  	    gn->made = ABORTED;
  	    pgn->make = FALSE;
--- 459,465 ----
  	gn->make = TRUE;
  	gn->made = BEINGMADE;
  	Suff_FindDeps (gn);
! 	Lst_ForEach(gn->children, CompatMake, gn);
  	if (!gn->make) {
  	    gn->made = ABORTED;
  	    pgn->make = FALSE;
***************
*** 522,528 ****
  	     */
  	    if (!touchFlag) {
  		curTarg = gn;
! 		Lst_ForEach (gn->commands, CompatRunCommand, (ClientData)gn);
  		curTarg = NULL;
  	    } else {
  		Job_Touch (gn, gn->type & OP_SILENT);
--- 522,528 ----
  	     */
  	    if (!touchFlag) {
  		curTarg = gn;
! 		Lst_ForEach(gn->commands, CompatRunCommand, gn);
  		curTarg = NULL;
  	    } else {
  		Job_Touch (gn, gn->type & OP_SILENT);
***************
*** 691,697 ****
      if (!queryFlag) {
  	gn = Targ_FindNode(".BEGIN", TARG_NOCREATE);
  	if (gn != NULL) {
! 	    Lst_ForEach(gn->commands, CompatRunCommand, (ClientData)gn);
              if (gn->made == ERROR) {
                  printf("\n\nStop.\n");
                  exit(1);
--- 691,697 ----
      if (!queryFlag) {
  	gn = Targ_FindNode(".BEGIN", TARG_NOCREATE);
  	if (gn != NULL) {
! 	    Lst_ForEach(gn->commands, CompatRunCommand, gn);
              if (gn->made == ERROR) {
                  printf("\n\nStop.\n");
                  exit(1);
***************
*** 725,730 ****
       * If the user has defined a .END target, run its commands.
       */
      if (errors == 0) {
! 	Lst_ForEach(ENDNode->commands, CompatRunCommand, (ClientData)gn);
      }
  }
--- 725,730 ----
       * If the user has defined a .END target, run its commands.
       */
      if (errors == 0) {
! 	Lst_ForEach(ENDNode->commands, CompatRunCommand, gn);
      }
  }