xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libplumb: search for plumber only at /mnt/plumb, and don't try to mount $plumbsrv if the search fails

Browse source
This commit is contained in:
BurnZeZ 2013-10-31 04:26:01 -04:00
parent 9a1e762dcc
commit 1259fe5c38
1 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sys/src/libplumb/mesg.c
View file

@ -5,37 +5,16 @@
int
plumbopen(char *name, int omode)
{
int fd, f;
char *s, *plumber;
int fd;
char buf[128], err[ERRMAX];
if(name[0] == '/')
return open(name, omode);
/* find elusive plumber */
if(access("/mnt/plumb/send", AWRITE) >= 0)
plumber = "/mnt/plumb";
else if(access("/mnt/term/mnt/plumb/send", AWRITE) >= 0)
plumber = "/mnt/term/mnt/plumb";
else{
/* last resort: try mounting service */
plumber = "/mnt/plumb";
s = getenv("plumbsrv");
if(s == nil)
return -1;
f = open(s, ORDWR);
free(s);
if(f < 0)
return -1;
if(mount(f, -1, "/mnt/plumb", MREPL, "") < 0){
close(f);
return -1;
}
if(access("/mnt/plumb/send", AWRITE) < 0)
return -1;
}
snprint(buf, sizeof buf, "%s/%s", plumber, name);
if(access("/mnt/plumb/send", AWRITE) < 0)
return -1;
snprint(buf, sizeof buf, "/mnt/plumb/%s", name);
fd = open(buf, omode);
if(fd >= 0)
return fd;