aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am5
-rw-r--r--sshfs.1.in (renamed from sshfs.1)12
3 files changed, 17 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index daba941..f39c637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ Makefile
*.m4
stamp-h*
config.*
+sshfs.1
/sshfs
/ltmain.sh
/configure
diff --git a/Makefile.am b/Makefile.am
index a80788b..b43956c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,13 @@ sshfs_CFLAGS = $(SSHFS_CFLAGS)
sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\"
EXTRA_DIST = sshnodelay.c FAQ.txt
-CLEANFILES = sshnodelay.so
+CLEANFILES = sshnodelay.so sshfs.1
dist_man_MANS = sshfs.1
+sshfs.1:
+ $(CPP) $(CPPFLAGS) -P -xassembler-with-cpp sshfs.1.in | sed -e '/^$$/d' > sshfs.1
+
if SSH_NODELAY_SO
all-local: sshnodelay.so
diff --git a/sshfs.1 b/sshfs.1.in
index d316930..aef99fd 100644
--- a/sshfs.1
+++ b/sshfs.1.in
@@ -7,7 +7,11 @@ SSHFS \- filesystem client based on ssh
\fBsshfs\fP [\fIuser\fP@]\fBhost\fP:[\fIdir\fP] \fBmountpoint\fP [\fIoptions\fP]
.SS unmounting
.TP
+#ifdef __APPLE__
+\fBumount mountpoint\fP
+#else
\fBfusermount -u mountpoint\fP
+#endif
.SH DESCRIPTION
SSHFS (Secure SHell FileSystem) is a file system for Linux (and other
operating systems with a FUSE implementation, such as Mac OS X or FreeBSD)
@@ -98,10 +102,18 @@ user/group ID mapping, possible types are:
.RS 8
.TP
none
+#ifdef __APPLE__
+no translation of the ID space
+#else
no translation of the ID space (default)
+#endif
.TP
user
+#ifdef __APPLE__
+only translate UID/GID of connecting user (default)
+#else
only translate UID of connecting user
+#endif
.TP
file
translate UIDs/GIDs based upon the contents of \fBuidfile \fR and