===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/job.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/make/job.c	2000/03/26 16:21:32	1.25
--- src/usr.bin/make/job.c	2000/06/10 01:26:36	1.26
***************
*** 1,4 ****
! /*	$OpenBSD: job.c,v 1.25 2000/03/26 16:21:32 espie Exp $	*/
  /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: job.c,v 1.26 2000/06/10 01:26:36 espie Exp $	*/
  /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: job.c,v 1.25 2000/03/26 16:21:32 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: job.c,v 1.26 2000/06/10 01:26:36 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 500,506 ****
   *	This function is called from JobStart via Lst_ForEach.
   *
   * Results:
!  *	Always 0, unless the command was "..."
   *
   * Side Effects:
   *	If the command begins with a '-' and the shell has no error control,
--- 500,506 ----
   *	This function is called from JobStart via Lst_ForEach.
   *
   * Results:
!  *	Always 1, unless the command was "..."
   *
   * Side Effects:
   *	If the command begins with a '-' and the shell has no error control,
***************
*** 537,545 ****
  	if ((job->flags & JOB_IGNDOTS) == 0) {
  	    job->tailCmds = Lst_Succ(Lst_Member(job->node->commands,
  						cmd));
! 	    return 1;
  	}
! 	return 0;
      }
  
  #define DBPRINTF(fmt, arg) if (DEBUG(JOB)) {	\
--- 537,545 ----
  	if ((job->flags & JOB_IGNDOTS) == 0) {
  	    job->tailCmds = Lst_Succ(Lst_Member(job->node->commands,
  						cmd));
! 	    return 0;
  	}
! 	return 1;
      }
  
  #define DBPRINTF(fmt, arg) if (DEBUG(JOB)) {	\
***************
*** 654,660 ****
      if (shutUp) {
  	DBPRINTF("%s\n", commandShell->echoOn);
      }
!     return 0;
  }
  
  /*-
--- 654,660 ----
      if (shutUp) {
  	DBPRINTF("%s\n", commandShell->echoOn);
      }
!     return 1;
  }
  
  /*-
***************
*** 1763,1771 ****
  	    } else {
  		LstNode	ln = Lst_Next(gn->commands);
  
! 		if ((ln == NULL) ||
! 		    JobPrintCommand(Lst_Datum(ln), job))
! 		{
  		    noExec = TRUE;
  		    Lst_Close(gn->commands);
  		}
--- 1763,1769 ----
  	    } else {
  		LstNode	ln = Lst_Next(gn->commands);
  
! 		if ((ln == NULL) || !JobPrintCommand(Lst_Datum(ln), job)) {
  		    noExec = TRUE;
  		    Lst_Close(gn->commands);
  		}
***************
*** 1789,1795 ****
  	     * We can do all the commands at once. hooray for sanity
  	     */
  	    numCommands = 0;
! 	    Lst_ForEach(gn->commands, JobPrintCommand, job);
  
  	    /*
  	     * If we didn't print out any commands to the shell script,
--- 1787,1793 ----
  	     * We can do all the commands at once. hooray for sanity
  	     */
  	    numCommands = 0;
! 	    Lst_Find(gn->commands, JobPrintCommand, job);
  
  	    /*
  	     * If we didn't print out any commands to the shell script,
***************
*** 1814,1822 ****
  	 * not -- just let the user know they're bad and keep going. It
  	 * doesn't do any harm in this case and may do some good.
  	 */
! 	if (cmdsOK) {
! 	    Lst_ForEach(gn->commands, JobPrintCommand, job);
! 	}
  	/*
  	 * Don't execute the shell, thank you.
  	 */
--- 1812,1819 ----
  	 * not -- just let the user know they're bad and keep going. It
  	 * doesn't do any harm in this case and may do some good.
  	 */
! 	if (cmdsOK)
! 	    Lst_Find(gn->commands, JobPrintCommand, job);
  	/*
  	 * Don't execute the shell, thank you.
  	 */