===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/error.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/make/error.c	2012/03/22 13:50:30	1.21
--- src/usr.bin/make/error.c	2012/09/21 07:55:20	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: error.c,v 1.21 2012/03/22 13:50:30 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
--- 1,4 ----
! /*	$OpenBSD: error.c,v 1.22 2012/09/21 07:55:20 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
***************
*** 44,50 ****
  #include "lowparse.h"
  
  int fatal_errors = 0;
- bool supervise_jobs = false;
  
  static void ParseVErrorInternal(const Location *, int, const char *, va_list);
  /*-
--- 44,49 ----
***************
*** 77,84 ****
  {
  	va_list ap;
  
! 	if (supervise_jobs)
! 		Job_Wait();
  
  	va_start(ap, fmt);
  	(void)vfprintf(stderr, fmt, ap);
--- 76,82 ----
  {
  	va_list ap;
  
! 	Job_Wait();
  
  	va_start(ap, fmt);
  	(void)vfprintf(stderr, fmt, ap);
***************
*** 102,114 ****
  void
  Punt(char *fmt, ...)
  {
! 	va_list ap;
  
! 	va_start(ap, fmt);
! 	(void)fprintf(stderr, "make: ");
! 	(void)vfprintf(stderr, fmt, ap);
! 	va_end(ap);
! 	(void)fprintf(stderr, "\n");
  
  	Job_AbortAll();
  	if (DEBUG(GRAPH2))
--- 100,114 ----
  void
  Punt(char *fmt, ...)
  {
! 	if (fmt) {
! 		va_list ap;
  
! 		va_start(ap, fmt);
! 		(void)fprintf(stderr, "make: ");
! 		(void)vfprintf(stderr, fmt, ap);
! 		va_end(ap);
! 		(void)fprintf(stderr, "\n");
! 	}
  
  	Job_AbortAll();
  	if (DEBUG(GRAPH2))
***************
*** 118,136 ****
  
  /*
   * Finish --
!  *	Called when aborting due to errors in child shell to signal
!  *	abnormal exit.
   *
   * Side Effects:
   *	The program exits
   */
  void
! Finish(int errors) /* number of errors encountered in Make_Make */
  {
  	Job_Wait();
- 	if (errors != 0) {
- 		Error("Stop in %s:", Var_Value(".CURDIR"));
- 	}
  	print_errors();
  	if (DEBUG(GRAPH2))
  		Targ_PrintGraph(2);
--- 118,132 ----
  
  /*
   * Finish --
!  *	Called when aborting due to errors in command or fatal signal
   *
   * Side Effects:
   *	The program exits
   */
  void
! Finish()
  {
  	Job_Wait();
  	print_errors();
  	if (DEBUG(GRAPH2))
  		Targ_PrintGraph(2);