From f187961c7a6a2433c8af7e758d8185568d8006a2 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Fri, 7 Jul 2017 23:30:17 +0200 Subject: Don't require mount point to exists on macOS By default volumes are mounted under /Volumes on macOS. Since macOS 10.12 the /Volumes directory is root-owned. In order to allow non- privileged users to mount FUSE volumes under /Volumes FUSE will create non-existent mount points automatically. Fixes osxfuse/sshfs#27 --- sshfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sshfs.c') diff --git a/sshfs.c b/sshfs.c index 2ef45d5..f116633 100644 --- a/sshfs.c +++ b/sshfs.c @@ -4121,7 +4121,7 @@ int main(int argc, char *argv[]) char *mountpoint; int multithreaded; int foreground; -#if !defined(__CYGWIN__) +#if !defined(__APPLE__) && !defined(__CYGWIN__) struct stat st; #endif @@ -4135,14 +4135,14 @@ int main(int argc, char *argv[]) foreground = 1; } -#if !defined(__CYGWIN__) +#if !defined(__APPLE__) && !defined(__CYGWIN__) res = stat(mountpoint, &st); if (res == -1) { perror(mountpoint); exit(1); } sshfs.mnt_mode = st.st_mode; -#elif defined(__CYGWIN__) +#else sshfs.mnt_mode = S_IFDIR | 0755; #endif -- cgit v1.2.3