plan9port

commit d16cfe2431bc5e31128adf0d577a3483a89f8f82
parent bdf49b7ee0229aa7c871402aed264789c901ff69
Author: rsc <devnull@localhost>
Date:   Mon, 16 Aug 2004 17:20:41 +0000

handle grap.defines properly

Diffstat:
M
src/cmd/grap/main.c
 | 
2
+-
M
src/cmd/grap/print.c
 | 
6
++++--

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/cmd/grap/main.c b/src/cmd/grap/main.c
@@ -10,7 +10,7 @@
 int	dbg	= 0;
 
 #ifndef GRAPDEFINES
-#define GRAPDEFINES "#9/sys/lib/grap.defines"
+#define GRAPDEFINES "#9/lib/grap.defines"
 #endif
 char	*lib_defines;
 
diff --git a/src/cmd/grap/print.c b/src/cmd/grap/print.c
@@ -177,6 +177,7 @@ void do_first(void)	/* done at first .G1:  definitions, etc. */
 {
 	extern int lib;
 	extern char *lib_defines;
+	char *file;
 	static char buf[50], buf1[50];	/* static because pbstr uses them */
 	FILE *fp;
 	extern int getpid(void);
@@ -184,8 +185,9 @@ void do_first(void)	/* done at first .G1:  definitions, etc. */
 	sprintf(buf, "define pid /%d/\n", getpid());
 	pbstr(buf);	
 	if (lib != 0) {
-		if ((fp = fopen(unsharp(lib_defines), "r")) != NULL) {
-			sprintf(buf1, "copy \"%s\"\n", lib_defines);
+		file = unsharp(lib_defines);
+		if ((fp = fopen(file, "r")) != NULL) {
+			sprintf(buf1, "copy \"%s\"\n", file);
 			pbstr(buf1);
 			fclose(fp);
 		} else {