Fix an FPE error.

PR:		9492
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>
This commit is contained in:
Steve Price 1999-01-18 02:53:24 +00:00
parent 94598608af
commit dcfbeed9e1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=16129
4 changed files with 19 additions and 42 deletions

View file

@ -1,9 +1,9 @@
# New ports collection makefile for: nawk # New ports collection makefile for: nawk
# Version required: 98.02.11 # Version required: 98.10.20
# Date created: 29 April 1998 # Date created: 29 April 1998
# Whom: Josh Gilliam <josh@quick.net> # Whom: Josh Gilliam <josh@quick.net>
# #
# $Id: Makefile,v 1.1.1.1 1998/07/04 19:21:55 steve Exp $ # $Id: Makefile,v 1.2 1998/11/10 02:05:09 steve Exp $
# #
DISTNAME= awk DISTNAME= awk

View file

@ -1,5 +1,5 @@
*** makefile.orig Tue Oct 20 08:48:03 1998 *** makefile.orig Tue Oct 20 08:48:03 1998
--- makefile Sun Nov 1 16:32:49 1998 --- makefile Wed Jan 13 19:10:37 1999
*************** ***************
*** 22,34 **** *** 22,34 ****
# THIS SOFTWARE. # THIS SOFTWARE.
@ -19,11 +19,11 @@
# THIS SOFTWARE. # THIS SOFTWARE.
# ****************************************************************/ # ****************************************************************/
! CFLAGS ?= ${CFLAGS} ! #CFLAGS = -g
! #CFLAGS = -O ! CFLAGS ?= -O
! #CC = gcc -Wall -g ! #CC = gcc -Wall -g
! #CC = purify cc ! #CC = purify cc
! CC ?= ${CC} ! CC ?= cc
! #YACC = bison -y ! #YACC = bison -y
YACC = yacc YACC = yacc

View file

@ -1,5 +1,5 @@
*** b.c.orig Sun Nov 1 17:14:22 1998 *** b.c.orig Mon Oct 19 18:42:53 1998
--- b.c Sun Nov 1 17:23:00 1998 --- b.c Wed Jan 13 17:46:54 1999
*************** ***************
*** 27,32 **** *** 27,32 ****
--- 27,35 ---- --- 27,35 ----
@ -87,11 +87,11 @@
continue; continue;
} }
} }
*** main.c.orig Sun Nov 1 17:24:32 1998 *** main.c.orig Mon Oct 19 18:49:03 1998
--- main.c Sun Nov 1 17:28:40 1998 --- main.c Wed Jan 13 17:51:59 1999
*************** ***************
*** 27,38 **** *** 27,32 ****
--- 27,43 ---- --- 27,33 ----
#define DEBUG #define DEBUG
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
@ -99,18 +99,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include "awk.h"
#include "ytab.h"
+ #ifdef __FreeBSD__
+ # include <floatingpoint.h>
+ #endif
+
extern char **environ;
extern int nfields;
*************** ***************
*** 55,66 **** *** 55,61 ****
char *fs = NULL, *marg; char *fs = NULL, *marg;
int temp; int temp;
@ -118,12 +108,7 @@
if (argc == 1) { if (argc == 1) {
fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname);
exit(1); exit(1);
} --- 56,67 ----
signal(SIGFPE, fpecatch);
yyin = NULL;
symtab = makesymtab(NSYMTAB);
while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
--- 60,80 ----
char *fs = NULL, *marg; char *fs = NULL, *marg;
int temp; int temp;
@ -136,12 +121,3 @@
if (argc == 1) { if (argc == 1) {
fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname);
exit(1); exit(1);
}
signal(SIGFPE, fpecatch);
+ #ifdef __FreeBSD__
+ fpsetround(FP_RN);
+ fpsetmask(0L);
+ #endif
yyin = NULL;
symtab = makesymtab(NSYMTAB);
while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {

View file

@ -1,9 +1,10 @@
This is the version of awk described in "The AWK Programming Language",
by Al Aho, Brian Kernighan, and Peter Weinberger
(Addison-Wesley, 1988, ISBN 0-201-07981-X).
Awk scans input files for specified patterns and can perform an associated Awk scans input files for specified patterns and can perform an associated
action when a line of the file matches the pattern. action when a line of the file matches the pattern.
This is the version of awk described in "The AWK Programming Language",
by Al Aho, Brian Kernighan, and Peter Weinberger
(Addison-Wesley, 1988, ISBN 0-201-07981-X).
http://cm.bell-labs.com/cm/cs/awkbook/index.html
-- --
Josh Gilliam <josh@quick.net> Josh Gilliam <josh@quick.net>