From 861d308a03319e23286290ee8cffc6fd307e0ec9 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sshfs.c b/sshfs.c index acea663..5475d98 100644 --- a/sshfs.c +++ b/sshfs.c @@ -3825,7 +3825,7 @@ int main(int argc, char *argv[]) const char *sftp_server; struct fuse *fuse; struct fuse_session *se; -#if !defined(__CYGWIN__) +#if !defined(__APPLE__) && !defined(__CYGWIN__) struct stat st; #endif @@ -3989,15 +3989,14 @@ int main(int argc, char *argv[]) g_free(tmp); g_free(fsname); - -#if !defined(__CYGWIN__) +#if !defined(__APPLE__) && !defined(__CYGWIN__) res = stat(sshfs.mountpoint, &st); if (res == -1) { perror(sshfs.mountpoint); exit(1); } sshfs.mnt_mode = st.st_mode; -#elif defined(__CYGWIN__) +#else sshfs.mnt_mode = S_IFDIR | 0755; #endif -- cgit v1.2.3