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

C

Browse source 
err is a bad name for a variable.
VS: ----------------------------------------------------------------------
This commit is contained in:
rsc 2004-04-20 00:20:36 +00:00
parent 67a5b28ed0
commit 13e660708d
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/cmd/acid/acid.h
View file

@ -56,6 +56,7 @@ Extern int gotint;
Extern long flen; Extern long flen;
Extern Gc* gcl; Extern Gc* gcl;
Extern int stacked; Extern int stacked;
#define err aciderrjmp
Extern jmp_buf err; Extern jmp_buf err;
Extern Node* prnt; Extern Node* prnt;
Extern Node* fomt; Extern Node* fomt;

10
src/cmd/acid/main.c
View file

@ -97,13 +97,13 @@ main(int argc, char *argv[])
l->v->type = TLIST; l->v->type = TLIST;
l->v->store.u.l = nil; l->v->store.u.l = nil;
loadmodule("/usr/local/plan9/acid/port"); loadmodule(unsharp("#9/acid/port"));
for(i = 0; i < nlm; i++) { for(i = 0; i < nlm; i++) {
if(access(lm[i], AREAD) >= 0) if(access(lm[i], AREAD) >= 0)
loadmodule(lm[i]); loadmodule(lm[i]);
else { else {
sprint(buf, "/usr/local/plan9/acid/%s", lm[i]); sprint(buf, "#9/acid/%s", lm[i]);
loadmodule(buf); loadmodule(unsharp(buf));
} }
} }
@ -320,8 +320,8 @@ userinit(void)
Node *n; Node *n;
char buf[128], *p; char buf[128], *p;
sprint(buf, "/usr/local/plan9/acid/%s", mach->name); sprint(buf, "#9/acid/%s", mach->name);
loadmodule(buf); loadmodule(unsharp(buf));
p = getenv("home"); p = getenv("home");
if(p != 0) { if(p != 0) {
sprint(buf, "%s/lib/acid", p); sprint(buf, "%s/lib/acid", p);