===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/eval.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/m4/eval.c	2006/01/20 23:10:19	1.59
--- src/usr.bin/m4/eval.c	2006/03/20 10:55:19	1.60
***************
*** 1,4 ****
! /*	$OpenBSD: eval.c,v 1.59 2006/01/20 23:10:19 espie Exp $	*/
  /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: eval.c,v 1.60 2006/03/20 10:55:19 espie Exp $	*/
  /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
  
  /*
***************
*** 48,54 ****
  #include <stddef.h>
  #include <string.h>
  #include <fcntl.h>
- #include <err.h>
  #include "mdef.h"
  #include "stdd.h"
  #include "extern.h"
--- 48,53 ----
***************
*** 101,108 ****
  
  	expansion_id++;
  	if (td & RECDEF) 
! 		errx(1, "%s at line %lu: expanding recursive definition for %s",
! 			CURRENT_NAME, CURRENT_LINE, argv[1]);
  	if (is_traced)
  		mark = trace(argv, argc, infile+ilevel);
  	if (td == MACRTYPE)
--- 100,106 ----
  
  	expansion_id++;
  	if (td & RECDEF) 
! 		m4errx(1, "expanding recursive definition for %s.", argv[1]);
  	if (is_traced)
  		mark = trace(argv, argc, infile+ilevel);
  	if (td == MACRTYPE)
***************
*** 180,192 ****
  		if (argc > 3) {
  			base = strtonum(argv[3], 2, 36, &errstr);
  			if (errstr) {
! 				errx(1, "base %s invalid", argv[3]);
  			}
  		}
  		if (argc > 4) {
  			maxdigits = strtonum(argv[4], 0, INT_MAX, &errstr);
  			if (errstr) {
! 				errx(1, "maxdigits %s invalid", argv[4]);
  			}
  		}
  		if (argc > 2)
--- 178,190 ----
  		if (argc > 3) {
  			base = strtonum(argv[3], 2, 36, &errstr);
  			if (errstr) {
! 				m4errx(1, "expr: base %s invalid.", argv[3]);
  			}
  		}
  		if (argc > 4) {
  			maxdigits = strtonum(argv[4], 0, INT_MAX, &errstr);
  			if (errstr) {
! 				m4errx(1, "expr: maxdigits %s invalid.", argv[4]);
  			}
  		}
  		if (argc > 2)
***************
*** 489,496 ****
  		pbstr(lquote);
  		break;
  	default:
! 		errx(1, "%s at line %lu: eval: major botch.",
! 			CURRENT_NAME, CURRENT_LINE);
  		break;
  	}
  }
--- 487,493 ----
  		pbstr(lquote);
  		break;
  	default:
! 		m4errx(1, "eval: major botch.");
  		break;
  	}
  }
***************
*** 576,583 ****
  dodefine(const char *name, const char *defn)
  {
  	if (!*name)
! 		errx(1, "%s at line %lu: null definition.", CURRENT_NAME,
! 		    CURRENT_LINE);
  	macro_define(name, defn);
  }
  
--- 573,579 ----
  dodefine(const char *name, const char *defn)
  {
  	if (!*name)
! 		m4errx(1, "null definition.");
  	macro_define(name, defn);
  }
  
***************
*** 613,620 ****
  dopushdef(const char *name, const char *defn)
  {
  	if (!*name)
! 		errx(1, "%s at line %lu: null definition", CURRENT_NAME,
! 		    CURRENT_LINE);
  	macro_pushdef(name, defn);
  }
  
--- 609,615 ----
  dopushdef(const char *name, const char *defn)
  {
  	if (!*name)
! 		m4errx(1, "null definition.");
  	macro_pushdef(name, defn);
  }
  
***************
*** 697,704 ****
  doincl(const char *ifile)
  {
  	if (ilevel + 1 == MAXINP)
! 		errx(1, "%s at line %lu: too many include files.",
! 		    CURRENT_NAME, CURRENT_LINE);
  	if (fopen_trypath(infile+ilevel+1, ifile) != NULL) {
  		ilevel++;
  		bbase[ilevel] = bufbase = bp;
--- 692,698 ----
  doincl(const char *ifile)
  {
  	if (ilevel + 1 == MAXINP)
! 		m4errx(1, "too many include files.");
  	if (fopen_trypath(infile+ilevel+1, ifile) != NULL) {
  		ilevel++;
  		bbase[ilevel] = bufbase = bp;