mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-27 11:52:03 +00:00
C
err is a bad name for a variable. VS: ----------------------------------------------------------------------
This commit is contained in:
parent
67a5b28ed0
commit
13e660708d
2 changed files with 6 additions and 5 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue