plan9port

commit 13e660708dc5c8f6b416c9da8b2e3e07b587734a
parent 67a5b28ed025f03f4164b0b401be61d2c0952b69
Author: rsc <devnull@localhost>
Date:   Tue, 20 Apr 2004 00:20:36 +0000

C
err is a bad name for a variable.
VS: ----------------------------------------------------------------------

Diffstat:
M
src/cmd/acid/acid.h
 | 
1
+
M
src/cmd/acid/main.c
 | 
10
+++++-----

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/cmd/acid/acid.h b/src/cmd/acid/acid.h
@@ -56,6 +56,7 @@ Extern int	gotint;
 Extern long	flen;
 Extern Gc*	gcl;
 Extern int	stacked;
+#define err aciderrjmp
 Extern jmp_buf	err;
 Extern Node*	prnt;
 Extern Node*	fomt;
diff --git a/src/cmd/acid/main.c b/src/cmd/acid/main.c
@@ -97,13 +97,13 @@ main(int argc, char *argv[])
 	l->v->type = TLIST;
 	l->v->store.u.l = nil;
 
-	loadmodule("/usr/local/plan9/acid/port");
+	loadmodule(unsharp("#9/acid/port"));
 	for(i = 0; i < nlm; i++) {
 		if(access(lm[i], AREAD) >= 0)
 			loadmodule(lm[i]);
 		else {
-			sprint(buf, "/usr/local/plan9/acid/%s", lm[i]);
-			loadmodule(buf);
+			sprint(buf, "#9/acid/%s", lm[i]);
+			loadmodule(unsharp(buf));
 		}
 	}
 
@@ -320,8 +320,8 @@ userinit(void)
 	Node *n;
 	char buf[128], *p;
 
-	sprint(buf, "/usr/local/plan9/acid/%s", mach->name);
-	loadmodule(buf);
+	sprint(buf, "#9/acid/%s", mach->name);
+	loadmodule(unsharp(buf));
 	p = getenv("home");
 	if(p != 0) {
 		sprint(buf, "%s/lib/acid", p);