diff options
Diffstat (limited to 'grap')
| -rw-r--r-- | grap/Makefile.mk | 7 | ||||
| -rw-r--r-- | grap/grap.1.in (renamed from grap/grap.1) | 0 | ||||
| -rw-r--r-- | grap/grapl.l | 8 | ||||
| -rw-r--r-- | grap/main.c | 10 |
4 files changed, 12 insertions, 13 deletions
diff --git a/grap/Makefile.mk b/grap/Makefile.mk index 4c82266d1311..26deb07d73e2 100644 --- a/grap/Makefile.mk +++ b/grap/Makefile.mk @@ -8,7 +8,7 @@ YFLAGS = -d .c.o: $(CC) $(_CFLAGS) $(FLAGS) -c $< -all: grap.c grapl.c grap +all: grap.c grapl.c grap grap.1 grap: $(OBJ) $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -lm -o grap @@ -23,10 +23,13 @@ install: $(INSTALL) -c -m 644 grap.1 $(ROOT)$(MANDIR)/man1/grap.1 clean: - rm -f $(OBJ) grapl.c grap.c y.tab.h grap core log *~ + rm -f $(OBJ) grapl.c grap.c y.tab.h grap core log *~ grap.1 mrproper: clean +grap.1: grap.1.in + sed 's"/usr/ucblib/"$(ROOT)$(LIBDIR)/"' grap.1.in > $@ + coord.o: coord.c grap.h y.tab.h for.o: for.c grap.h y.tab.h frame.o: frame.c grap.h y.tab.h diff --git a/grap/grap.1 b/grap/grap.1.in index a3a96a5cb2b6..a3a96a5cb2b6 100644 --- a/grap/grap.1 +++ b/grap/grap.1.in diff --git a/grap/grapl.l b/grap/grapl.l index 763537270e89..b6d1891e5dab 100644 --- a/grap/grapl.l +++ b/grap/grapl.l @@ -12,6 +12,7 @@ /* Sccsid @(#)grapl.l 1.4 (gritter) 11/22/05 */ %} +%option nounput %Start A str def thru sh %{ @@ -237,10 +238,3 @@ WS [ \t] <str>. { CADD; } %% - -#ifdef FLEX_SCANNER -void xxcruft(void) -{ - unput(0); -} -#endif /* FLEX_SCANNER */ diff --git a/grap/main.c b/grap/main.c index eb4478945c02..52c77b4ee6a4 100644 --- a/grap/main.c +++ b/grap/main.c @@ -17,8 +17,12 @@ #include <string.h> #include <unistd.h> #include "grap.h" +#include "global.h" #include "y.tab.h" +static void onintr(int n); +static void fpecatch(int n); + int dbg = 0; #define GRAPDEFINES LIBDIR "/grap.defines" @@ -48,8 +52,6 @@ extern void getdata(void); int main(int argc, char *argv[]) { - extern void onintr(int), fpecatch(int); - if (signal(SIGINT, SIG_IGN) != SIG_IGN) signal(SIGINT, onintr); signal(SIGFPE, fpecatch); @@ -102,14 +104,14 @@ main(int argc, char *argv[]) } /*ARGSUSED*/ -void onintr(int n) +static void onintr(int n __unused) { if (!dbg) unlink(tempfile); exit(1); } -void fpecatch(int n) +static void fpecatch(int n) { WARNING("floating point exception"); onintr(n); |