aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/acid
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2004-04-20 00:20:36 +0000
committerrsc <devnull@localhost>2004-04-20 00:20:36 +0000
commit13e660708dc5c8f6b416c9da8b2e3e07b587734a (patch)
tree55cb844e96a6deca1378f9e1b59522521e3ece19 /src/cmd/acid
parent67a5b28ed025f03f4164b0b401be61d2c0952b69 (diff)
downloadplan9port-13e660708dc5c8f6b416c9da8b2e3e07b587734a.tar.gz
plan9port-13e660708dc5c8f6b416c9da8b2e3e07b587734a.tar.bz2
plan9port-13e660708dc5c8f6b416c9da8b2e3e07b587734a.zip
C
err is a bad name for a variable. VS: ----------------------------------------------------------------------
Diffstat (limited to 'src/cmd/acid')
-rw-r--r--src/cmd/acid/acid.h1
-rw-r--r--src/cmd/acid/main.c10
2 files changed, 6 insertions, 5 deletions
diff --git a/src/cmd/acid/acid.h b/src/cmd/acid/acid.h
index 729341b3..ae835ef9 100644
--- 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
index 5e68e466..9c57ae6a 100644
--- 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);