===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/lib.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/awk/lib.c	1999/04/18 17:06:30	1.5
--- src/usr.bin/awk/lib.c	1999/04/20 17:31:29	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: lib.c,v 1.5 1999/04/18 17:06:30 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
--- 1,4 ----
! /*	$OpenBSD: lib.c,v 1.6 1999/04/20 17:31:29 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
***************
*** 487,492 ****
--- 487,494 ----
  	fprintf(stderr, " at source line %d", lineno);
  	if (curfname != NULL)
  		fprintf(stderr, " in function %s", curfname);
+ 	if (compile_time == 1 && cursource() != NULL)
+ 		fprintf(stderr, " source file %s", cursource());
  	fprintf(stderr, "\n");
  	errorflag = 2;
  	eprint();
***************
*** 541,549 ****
  		fprintf(stderr, "\n");
  	}
  	if (compile_time != 2 && curnode)
! 		fprintf(stderr, " source line number %d\n", curnode->lineno);
  	else if (compile_time != 2 && lineno)
! 		fprintf(stderr, " source line number %d\n", lineno);
  	eprint();
  	if (f) {
  		if (dbg > 1)		/* core dump if serious debugging on */
--- 543,554 ----
  		fprintf(stderr, "\n");
  	}
  	if (compile_time != 2 && curnode)
! 		fprintf(stderr, " source line number %d", curnode->lineno);
  	else if (compile_time != 2 && lineno)
! 		fprintf(stderr, " source line number %d", lineno);
! 	if (compile_time == 1 && cursource() != NULL)
! 		fprintf(stderr, " source file %s", cursource());
! 	fprintf(stderr, "\n");
  	eprint();
  	if (f) {
  		if (dbg > 1)		/* core dump if serious debugging on */
***************
*** 602,608 ****
  
  double errcheck(double x, char *s)
  {
- 	extern int errno;
  
  	if (errno == EDOM) {
  		errno = 0;
--- 607,612 ----