===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/b.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/awk/b.c	1999/04/20 17:31:29	1.7
--- src/usr.bin/awk/b.c	1999/12/08 23:09:45	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: b.c,v 1.7 1999/04/20 17:31:29 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
--- 1,4 ----
! /*	$OpenBSD: b.c,v 1.8 1999/12/08 23:09:45 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
***************
*** 199,205 ****
  		parent(right(p)) = p;
  		break;
  	default:	/* can't happen */
! 		ERROR "can't happen: unknown type %d in penter", type(p) FATAL;
  		break;
  	}
  }
--- 199,205 ----
  		parent(right(p)) = p;
  		break;
  	default:	/* can't happen */
! 		FATAL("can't happen: unknown type %d in penter", type(p));
  		break;
  	}
  }
***************
*** 221,227 ****
  		xfree(p);
  		break;
  	default:	/* can't happen */
! 		ERROR "can't happen: unknown type %d in freetr", type(p) FATAL;
  		break;
  	}
  }
--- 221,227 ----
  		xfree(p);
  		break;
  	default:	/* can't happen */
! 		FATAL("can't happen: unknown type %d in freetr", type(p));
  		break;
  	}
  }
***************
*** 292,298 ****
  
  	op = p;
  	if (buf == 0 && (buf = (char *) malloc(bufsz)) == NULL)
! 		ERROR "out of space for character class [%.10s...] 1", p FATAL;
  	bp = buf;
  	for (i = 0; (c = *p++) != 0; ) {
  		if (c == '\\') {
--- 292,298 ----
  
  	op = p;
  	if (buf == 0 && (buf = (char *) malloc(bufsz)) == NULL)
! 		FATAL("out of space for character class [%.10s...] 1", p);
  	bp = buf;
  	for (i = 0; (c = *p++) != 0; ) {
  		if (c == '\\') {
***************
*** 310,316 ****
  				}
  				while (c < c2) {
  					if (!adjbuf(&buf, &bufsz, bp-buf+2, 100, &bp, 0))
! 						ERROR "out of space for character class [%.10s...] 2", p FATAL;
  					*bp++ = ++c;
  					i++;
  				}
--- 310,316 ----
  				}
  				while (c < c2) {
  					if (!adjbuf(&buf, &bufsz, bp-buf+2, 100, &bp, 0))
! 						FATAL("out of space for character class [%.10s...] 2", p);
  					*bp++ = ++c;
  					i++;
  				}
***************
*** 318,324 ****
  			}
  		}
  		if (!adjbuf(&buf, &bufsz, bp-buf+2, 100, &bp, 0))
! 			ERROR "out of space for character class [%.10s...] 3", p FATAL;
  		*bp++ = c;
  		i++;
  	}
--- 318,324 ----
  			}
  		}
  		if (!adjbuf(&buf, &bufsz, bp-buf+2, 100, &bp, 0))
! 			FATAL("out of space for character class [%.10s...] 3", p);
  		*bp++ = c;
  		i++;
  	}
***************
*** 330,336 ****
  
  void overflo(char *s)
  {
! 	ERROR "regular expression too big: %.30s...", s FATAL;
  }
  
  void cfoll(fa *f, Node *v)	/* enter follow set of each leaf of vertex v into lfollow[leaf] */
--- 330,336 ----
  
  void overflo(char *s)
  {
! 	FATAL("regular expression too big: %.30s...", s);
  }
  
  void cfoll(fa *f, Node *v)	/* enter follow set of each leaf of vertex v into lfollow[leaf] */
***************
*** 370,376 ****
  		cfoll(f,right(v));
  		break;
  	default:	/* can't happen */
! 		ERROR "can't happen: unknown type %d in cfoll", type(v) FATAL;
  	}
  }
  
--- 370,376 ----
  		cfoll(f,right(v));
  		break;
  	default:	/* can't happen */
! 		FATAL("can't happen: unknown type %d in cfoll", type(v));
  	}
  }
  
***************
*** 411,417 ****
  		if (first(left(p)) == 0 || b == 0) return(0);
  		return(1);
  	}
! 	ERROR "can't happen: unknown type %d in first", type(p) FATAL;	/* can't happen */
  	return(-1);
  }
  
--- 411,417 ----
  		if (first(left(p)) == 0 || b == 0) return(0);
  		return(1);
  	}
! 	FATAL("can't happen: unknown type %d in first", type(p));	/* can't happen */
  	return(-1);
  }
  
***************
*** 584,593 ****
  	lastre = prestr = p;	/* prestr points to string to be parsed */
  	rtok = relex();
  	if (rtok == '\0')
! 		ERROR "empty regular expression" FATAL;
  	np = regexp();
  	if (rtok != '\0')
! 		ERROR "syntax error in regular expression %s at %s", lastre, prestr FATAL;
  	return(np);
  }
  
--- 584,593 ----
  	lastre = prestr = p;	/* prestr points to string to be parsed */
  	rtok = relex();
  	if (rtok == '\0')
! 		FATAL("empty regular expression");
  	np = regexp();
  	if (rtok != '\0')
! 		FATAL("syntax error in regular expression %s at %s", lastre, prestr);
  	return(np);
  }
  
***************
*** 637,645 ****
  			return (unary(np));
  		}
  		else
! 			ERROR "syntax error in regular expression %s at %s", lastre, prestr FATAL;
  	default:
! 		ERROR "illegal primary in regular expression %s at %s", lastre, prestr FATAL;
  	}
  	return 0;	/*NOTREACHED*/
  }
--- 637,645 ----
  			return (unary(np));
  		}
  		else
! 			FATAL("syntax error in regular expression %s at %s", lastre, prestr);
  	default:
! 		FATAL("illegal primary in regular expression %s at %s", lastre, prestr);
  	}
  	return 0;	/*NOTREACHED*/
  }
***************
*** 707,713 ****
  		return CHAR;
  	case '[': 
  		if (buf == 0 && (buf = (char *) malloc(bufsz)) == NULL)
! 			ERROR "out of space in reg expr %.10s..", lastre FATAL;
  		bp = buf;
  		if (*prestr == '^') {
  			cflag = 1;
--- 707,713 ----
  		return CHAR;
  	case '[': 
  		if (buf == 0 && (buf = (char *) malloc(bufsz)) == NULL)
! 			FATAL("out of space in reg expr %.10s..", lastre);
  		bp = buf;
  		if (*prestr == '^') {
  			cflag = 1;
***************
*** 717,733 ****
  			cflag = 0;
  		n = 2 * strlen(prestr)+1;
  		if (!adjbuf(&buf, &bufsz, n, n, &bp, 0))
! 			ERROR "out of space for reg expr %.10s...", lastre FATAL;
  		for (; ; ) {
  			if ((c = *prestr++) == '\\') {
  				*bp++ = '\\';
  				if ((c = *prestr++) == '\0')
! 					ERROR "nonterminated character class %.20s...", lastre FATAL;
  				*bp++ = c;
  			} else if (c == '\n') {
! 				ERROR "newline in character class %.20s...", lastre FATAL;
  			} else if (c == '\0') {
! 				ERROR "nonterminated character class %.20s", lastre FATAL;
  			} else if (bp == buf) {	/* 1st char is special */
  				*bp++ = c;
  			} else if (c == ']') {
--- 717,733 ----
  			cflag = 0;
  		n = 2 * strlen(prestr)+1;
  		if (!adjbuf(&buf, &bufsz, n, n, &bp, 0))
! 			FATAL("out of space for reg expr %.10s...", lastre);
  		for (; ; ) {
  			if ((c = *prestr++) == '\\') {
  				*bp++ = '\\';
  				if ((c = *prestr++) == '\0')
! 					FATAL("nonterminated character class %.20s...", lastre);
  				*bp++ = c;
  			} else if (c == '\n') {
! 				FATAL("newline in character class %.20s...", lastre);
  			} else if (c == '\0') {
! 				FATAL("nonterminated character class %.20s", lastre);
  			} else if (bp == buf) {	/* 1st char is special */
  				*bp++ = c;
  			} else if (c == ']') {
***************
*** 749,755 ****
  	int *p, *q;
  
  	if (c < 0)
! 		ERROR "can't happen: neg char %d in cgoto", c FATAL;
  	while (f->accept >= maxsetvec) {	/* guessing here! */
  		maxsetvec *= 4;
  		setvec = (int *) realloc(setvec, maxsetvec * sizeof(int));
--- 749,755 ----
  	int *p, *q;
  
  	if (c < 0)
! 		FATAL("can't happen: neg char %d in cgoto", c);
  	while (f->accept >= maxsetvec) {	/* guessing here! */
  		maxsetvec *= 4;
  		setvec = (int *) realloc(setvec, maxsetvec * sizeof(int));