diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Makefile | 4 | ||||
| -rw-r--r-- | fs/tabfs.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/fs/Makefile b/fs/Makefile index 37f0f3d..658adb7 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -15,8 +15,8 @@ ifeq ($(shell uname -s),Linux) LIBS = -lfuse -pthread endif ifeq ($(shell uname -s),Darwin) - CFLAGS += -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS_EXTRA) - LIBS = -losxfuse + CFLAGS += -I$(OSXFUSE_ROOT)/include -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS_EXTRA) + LIBS = -lfuse endif ifeq ($(shell uname -s),FreeBSD) CFLAGS += -L$(FREEBSD_ROOT)/lib -I$(FREEBSD_ROOT)/include $(CFLAGS_EXTRA) @@ -1,3 +1,9 @@ +// This file should rarely need to be changed. (which is intentional, +// because it is a pain to program here, it's a pain to recompile and +// reload it, and it's a pain to debug it.) Most of the behavior of +// TabFS -- the definitions of the synthetic files -- lives on the +// extension side, not here. + #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -439,7 +445,6 @@ static const struct fuse_operations tabfs_oper = { int main(int argc, char **argv) { (void)argc; - if (NULL == getenv("TABFS_MOUNT_DIR")) { setenv("TABFS_MOUNT_DIR", "mnt", 1); } @@ -467,6 +472,7 @@ int main(int argc, char **argv) { eprintln("pthread_create: %s", strerror(err)); exit(1); } + pthread_detach(thread); char *fuse_argv[] = { |