diff options
| author | Nikolaus Rath <Nikolaus@rath.org> | 2017-07-13 15:55:51 +0200 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2017-07-13 15:55:51 +0200 |
| commit | 8d9bccb98763c5bd626485d066315b737569cfbe (patch) | |
| tree | a77489cb2b6228f8aebc6b3212b67d8931c6d9db | |
| parent | cc5d6bbbc5b7e78296f5245988b9ba947076a1b8 (diff) | |
| parent | f187961c7a6a2433c8af7e758d8185568d8006a2 (diff) | |
| download | sshfs-8d9bccb98763c5bd626485d066315b737569cfbe.tar sshfs-8d9bccb98763c5bd626485d066315b737569cfbe.tar.gz sshfs-8d9bccb98763c5bd626485d066315b737569cfbe.tar.bz2 sshfs-8d9bccb98763c5bd626485d066315b737569cfbe.zip | |
Merge remote-tracking branch 'osxfuse/master' into sshfs_2.x
| -rw-r--r-- | sshfs.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1897,6 +1897,9 @@ static int sshfs_getattr(const char *path, struct stat *stbuf) &buf, SSH_FXP_ATTRS, &outbuf); if (!err) { err = buf_get_attrs(&outbuf, stbuf, NULL); +#ifdef __APPLE__ + stbuf->st_blksize = 0; +#endif buf_free(&outbuf); } buf_free(&buf); @@ -3106,6 +3109,9 @@ static int sshfs_fgetattr(const char *path, struct stat *stbuf, err = sftp_request(SSH_FXP_FSTAT, &buf, SSH_FXP_ATTRS, &outbuf); if (!err) { err = buf_get_attrs(&outbuf, stbuf, NULL); +#ifdef __APPLE__ + stbuf->st_blksize = 0; +#endif buf_free(&outbuf); } buf_free(&buf); @@ -4015,7 +4021,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 @@ -4029,14 +4035,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 |