commit 9b3fcf01c5d22d7be320a0e194cc54579f71c409
from: rsc <devnull@localhost>
date: Thu Jan 18 12:52:54 2007 UTC

Mac FUSE support (thanks to Jeff Sickel)

commit - e290e875f350dbbc2288ec988d939a57cc8f9bf2
commit + 9b3fcf01c5d22d7be320a0e194cc54579f71c409
blob - f20304b45420066f9955b0642f2b8f8c8fcb1f38
blob + 3cc36adbbb5e4e54b1da825000fe5693e6b70a6e
--- bin/mount
+++ bin/mount
@@ -18,6 +18,11 @@ case FreeBSD
 	if(kldstat|9 grep -si ' fuse')
 		exec 9pfuse $1 $2
 	echo 'don''t know how to mount (no fuse)' >[1=2]
+case Darwin
+	if(sysctl fuse.version >[2=1] |9 grep -si 'fuse.version' ||
+	   test -d /System/Library/Extensions/fusefs.kext)
+		exec 9pfuse $1 $2
+	echo 'don''t know how to mount (no fuse)' >[1=2]
 case *
 	echo 'can''t mount on' `{uname} >[1=2]
 }
blob - 3d2760f85379962478f4aa3dad487c59c0a0b781
blob + 6323e8433c690b3d95c32a89a29abf0b4fd91afd
--- bin/unmount
+++ bin/unmount
@@ -1,10 +1,10 @@
-#!/usr/local/plan9/bin/rc
+l#!/usr/local/plan9/bin/rc
 
 if(! ~ $#* 1){
 	echo 'usage: unmount mtpt' >[1=2]
 	exit usage
 }
 f=`{u mount | grep $1}
-if(echo $f | 9 grep -s 'type fuse')
+if(echo $f | 9 grep -s 'type fuse' && ! ~ `{uname} Darwin)
 	exec fusermount -u -z $1
 exec u umount $1
blob - 8d70885bbefe28cebd5d2f89ad626ce9cbdccc48
blob + f7bd575f370ddf5e3bbac9c2bc54d8f85040b034
--- man/man4/9pfuse.4
+++ man/man4/9pfuse.4
@@ -58,5 +58,8 @@ FUSE Homepage,
 .PP
 FUSE for FreeBSD,
 .HR http://fuse4bsd.creo.hu
+.PP
+MacFUSE,
+.HR http://code.google.com/p/macfuse
 .SH SOURCE
 .B \*9/src/cmd/9pfuse
blob - 2a6d13a437a69b64f21d0b7a50ffb888fbe9fac9
blob + b2ccd7fca7139c489d9fca390e21ff875bd4cf1f
--- src/cmd/9pfuse/fuse.c
+++ src/cmd/9pfuse/fuse.c
@@ -741,6 +741,11 @@ fusefmt(Fmt *fmt)
 	}
 	return 0;
 }
+
+#if defined(__APPLE__)
+#include <sys/param.h>
+#include <sys/mount.h>
+#endif
 
 /*
  * Mounts a fuse file system on mtpt and returns
@@ -788,6 +793,50 @@ mountfuse(char *mtpt)
 		_exit(1);
 	}
 	return fd;
+#elif defined(__APPLE__)
+	int i, pid, fd, r;
+	char buf[20];
+	struct vfsconf vfs;
+	
+	if(getvfsbyname("fusefs", &vfs) < 0){
+		if((r=system("/System/Library/Extensions/fusefs.kext"
+				"/Contents/Resources/load_fusefs")) < 0){
+			werrstr("load fusefs: %r");
+			return -1;
+		}
+		if(r != 0){
+			werrstr("load_fusefs failed: exit %d", r);
+			return -1;
+		}
+		if(getvfsbyname("fusefs", &vfs) < 0){
+			werrstr("getvfsbyname fusefs: %r");
+			return -1;
+		}
+	}
+	
+	/* Look for available FUSE device. */
+	for(i=0;; i++){
+		snprint(buf, sizeof buf, "/dev/fuse%d", i);
+		if(access(buf, 0) < 0){
+			werrstr("no available fuse devices");
+			return -1;
+		}
+		if((fd = open(buf, ORDWR)) >= 0)
+			break;
+	}
+
+	pid = fork();
+	if(pid < 0)
+		return -1;
+	if(pid == 0){
+		snprint(buf, sizeof buf, "%d", fd);
+		putenv("MOUNT_FUSEFS_CALL_BY_LIB", "");
+		execl("mount_fusefs", "mount_fusefs", buf, mtpt, nil);
+		fprint(2, "exec mount_fusefs: %r\n");
+		_exit(1);
+	}
+	return fd;
+	
 #else
 	werrstr("cannot mount fuse on this system");
 	return -1;
blob - 0bd3c0fd6409fb4c31f0f8cfc40fe0164a90b05f
blob + 3ad1941c9ef745fd35a044a25dea9e298f5ae6c5
--- src/libthread/Darwin-386.c
+++ src/libthread/Darwin-386.c
@@ -3,7 +3,6 @@
 void
 makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
-	int n;
 	int *sp;
 
 	sp = (int*)ucp->uc_stack.ss_sp+ucp->uc_stack.ss_size/4;