plan9port

fork of plan9port with libvec, libstr and libsdb
Log | Files | Refs | README | LICENSE

commit 4c65127bbe5a3a1866ae005be9d5e98d79165a15
parent 47964cbc7b1409edc4908f199912e25d17b63b55
Author: rsc <devnull@localhost>
Date:   Wed, 24 Jan 2007 16:24:04 +0000

google moved the fusefs.kext path

Diffstat:
Msrc/cmd/9pfuse/fuse.c | 13++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/cmd/9pfuse/fuse.c b/src/cmd/9pfuse/fuse.c @@ -797,11 +797,18 @@ mountfuse(char *mtpt) int i, pid, fd, r; char buf[20]; struct vfsconf vfs; + char *f; if(getvfsbyname("fusefs", &vfs) < 0){ - if((r=system("/System/Library/Extensions/fusefs.kext" - "/Contents/Resources/load_fusefs")) < 0){ - werrstr("load fusefs: %r"); + if(access(f="/System/Library/Extensions/fusefs.kext" + "/Contents/Resources/load_fusefs", 0) < 0 && + access(f="/Library/Extensions/fusefs.kext" + "/Contents/Resources/load_fusefs", 0) < 0){ + werrstr("cannot find load_fusefs"); + return -1; + } + if((r=system(f)) < 0){ + werrstr("%s: %r", f); return -1; } if(r != 0){