o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak grap to make it compile silently.

Browse source
This commit is contained in:
wkj 2004-05-17 02:22:23 +00:00
parent 7534722667
commit 1e1cea296a
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cmd/grap/grap.h
View file

@ -132,6 +132,8 @@ extern int pointsize, ps_set;
#define min(x,y) (((x) <= (y)) ? (x) : (y)) #define min(x,y) (((x) <= (y)) ? (x) : (y))
#define max(x,y) (((x) >= (y)) ? (x) : (y)) #define max(x,y) (((x) >= (y)) ? (x) : (y))
extern char *unsharp(char*);
extern void yyerror(char *); extern void yyerror(char *);
extern void coord_x(Point); extern void coord_x(Point);
extern void coord_y(Point); extern void coord_y(Point);
@ -202,6 +204,7 @@ extern void plot(Attr *, Point);
extern void plotnum(double, char *, Point); extern void plotnum(double, char *, Point);
extern void drawdesc(int, Obj *, Attr *, char *); extern void drawdesc(int, Obj *, Attr *, char *);
extern void next(Obj *, Point, Attr *); extern void next(Obj *, Point, Attr *);
#define print grapprint
extern void print(void); extern void print(void);
extern void endstat(void); extern void endstat(void);
extern void graph(char *); extern void graph(char *);

2
src/cmd/grap/input.c
View file

@ -540,7 +540,7 @@ void copy(void) /* begin input from file, etc. */
FILE *fin; FILE *fin;
if (newfile) { if (newfile) {
if ((fin = fopen(newfile, "r")) == NULL) if ((fin = fopen(unsharp(newfile), "r")) == NULL)
ERROR "can't open file %s", newfile FATAL; ERROR "can't open file %s", newfile FATAL;
curfile++; curfile++;
curfile->fin = fin; curfile->fin = fin;

11
src/cmd/grap/main.c
View file

@ -7,10 +7,11 @@
#include "grap.h" #include "grap.h"
#include "y.tab.h" #include "y.tab.h"
extern char *unsharp(char*);
int dbg = 0; int dbg = 0;
#ifndef GRAPDEFINES
#define GRAPDEFINES "#9/sys/lib/grap.defines"
#endif
char *lib_defines; char *lib_defines;
int lib = 1; /* 1 to include lib_defines */ int lib = 1; /* 1 to include lib_defines */
@ -40,7 +41,7 @@ main(int argc, char *argv[])
{ {
extern void onintr(int), fpecatch(int); extern void onintr(int), fpecatch(int);
lib_defines = unsharp("#9/lib/grap.defines"); lib_defines = unsharp(GRAPDEFINES);
if (signal(SIGINT, SIG_IGN) != SIG_IGN) if (signal(SIGINT, SIG_IGN) != SIG_IGN)
signal(SIGINT, onintr); signal(SIGINT, onintr);
@ -90,8 +91,8 @@ main(int argc, char *argv[])
void onintr(int n) void onintr(int n)
{ {
//n; if(n){}
if (!dbg) if(!dbg)
unlink(tempfile); unlink(tempfile);
exit(1); exit(1);
} }

2
src/cmd/grap/print.c
View file

@ -184,7 +184,7 @@ void do_first(void) /* done at first .G1: definitions, etc. */
sprintf(buf, "define pid /%d/\n", getpid()); sprintf(buf, "define pid /%d/\n", getpid());
pbstr(buf); pbstr(buf);
if (lib != 0) { if (lib != 0) {
if ((fp = fopen(lib_defines, "r")) != NULL) { if ((fp = fopen(unsharp(lib_defines), "r")) != NULL) {
sprintf(buf1, "copy \"%s\"\n", lib_defines); sprintf(buf1, "copy \"%s\"\n", lib_defines);
pbstr(buf1); pbstr(buf1);
fclose(fp); fclose(fp);