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

Include looks in #9/acid now.

Browse source 
Acid works harder at not falling over.
This commit is contained in:
rsc 2004-04-21 05:34:37 +00:00
parent eaf56db5bc
commit a8c15b08ca
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cmd/acid/builtin.c
View file

@ -478,6 +478,8 @@ interpret(Node *r, Node *args)
void
include(Node *r, Node *args)
{
char *file, *libfile;
static char buf[1024];
Node res;
int isave;
@ -488,7 +490,19 @@ include(Node *r, Node *args)
error("include(string): arg type");
Bflush(bout);
pushfile(res.store.u.string->string);
libfile = nil;
file = res.store.u.string->string;
if(access(file, AREAD) < 0 && file[0] != '/'){
snprint(buf, sizeof buf, "#9/acid/%s", file);
libfile = unsharp(buf);
if(access(libfile, AREAD) >= 0){
strecpy(buf, buf+sizeof buf, libfile);
file = buf;
}
free(libfile);
}
pushfile(file);
isave = interactive;
interactive = 0;