===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/awk/main.c	1999/12/04 00:12:25	1.8
--- src/usr.bin/awk/main.c	1999/12/08 23:09:45	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.8 1999/12/04 00:12:25 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.9 1999/12/08 23:09:45 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
***************
*** 23,29 ****
  THIS SOFTWARE.
  ****************************************************************/
  
! char	*version = "version 19990416";
  
  #define DEBUG
  #include <stdio.h>
--- 23,29 ----
  THIS SOFTWARE.
  ****************************************************************/
  
! char	*version = "version 19990620";
  
  #define DEBUG
  #include <stdio.h>
***************
*** 85,93 ****
  			argc--;
  			argv++;
  			if (npfile >= MAX_PFILE - 1)
! 				ERROR "too many -f options" FATAL;
  			if (argc <= 1)
! 				ERROR "no program filename" FATAL;
  			pfile[npfile++] = argv[1];
  			break;
  		case 'F':	/* set field separator */
--- 85,93 ----
  			argc--;
  			argv++;
  			if (npfile >= MAX_PFILE - 1)
! 				FATAL("too many -f options");
  			if (argc <= 1)
! 				FATAL("no program filename");
  			pfile[npfile++] = argv[1];
  			break;
  		case 'F':	/* set field separator */
***************
*** 104,110 ****
  					fs = &argv[1][0];
  			}
  			if (fs == NULL || *fs == '\0')
! 				ERROR "field separator FS is empty" WARNING;
  			break;
  		case 'v':	/* -v a=1 to be done NOW.  one -v for each */
  			if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
--- 104,110 ----
  					fs = &argv[1][0];
  			}
  			if (fs == NULL || *fs == '\0')
! 				WARNING("field separator FS is empty");
  			break;
  		case 'v':	/* -v a=1 to be done NOW.  one -v for each */
  			if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
***************
*** 122,128 ****
  			switch (marg[2]) {
  			case 'r':	recsize = temp; break;
  			case 'f':	nfields = temp; break;
! 			default: ERROR "unknown option %s\n", marg FATAL;
  			}
  			break;
  		case 'd':
--- 122,128 ----
  			switch (marg[2]) {
  			case 'r':	recsize = temp; break;
  			case 'f':	nfields = temp; break;
! 			default: FATAL("unknown option %s\n", marg);
  			}
  			break;
  		case 'd':
***************
*** 136,142 ****
  			exit(0);
  			break;
  		default:
! 			ERROR "unknown option %s ignored", argv[1] WARNING;
  			break;
  		}
  		argc--;
--- 136,142 ----
  			exit(0);
  			break;
  		default:
! 			WARNING("unknown option %s ignored", argv[1]);
  			break;
  		}
  		argc--;
***************
*** 147,153 ****
  		if (argc <= 1) {
  			if (dbg)
  				exit(0);
! 			ERROR "no program given" FATAL;
  		}
  		   dprintf( ("program = |%s|\n", argv[1]) );
  		lexprog = argv[1];
--- 147,153 ----
  		if (argc <= 1) {
  			if (dbg)
  				exit(0);
! 			FATAL("no program given");
  		}
  		   dprintf( ("program = |%s|\n", argv[1]) );
  		lexprog = argv[1];
***************
*** 185,191 ****
  			if (strcmp(pfile[curpfile], "-") == 0)
  				yyin = stdin;
  			else if ((yyin = fopen(pfile[curpfile], "r")) == NULL)
! 				ERROR "can't open file %s", pfile[curpfile] FATAL;
  			lineno = 1;
  		}
  		if ((c = getc(yyin)) != EOF)
--- 185,191 ----
  			if (strcmp(pfile[curpfile], "-") == 0)
  				yyin = stdin;
  			else if ((yyin = fopen(pfile[curpfile], "r")) == NULL)
! 				FATAL("can't open file %s", pfile[curpfile]);
  			lineno = 1;
  		}
  		if ((c = getc(yyin)) != EOF)