Ticket #15351: osx_ext2fuse.diff

src/ext2fs.c

@@ -49 +49 @@
         st->st_ctime = inode->i_ctime;
         // We don't have to implement nanosecs, fs's which don't can return
         // 0 here:
-        st->st_atim.tv_nsec = 0;
+    #if (__FreeBSD__ >= 10)
+        #ifndef _POSIX_C_SOURCE
+            st->st_atimespec.tv_nsec = 0;
+        st->st_mtimespec.tv_nsec = 0;
+        st->st_ctimespec.tv_nsec = 0;
+        #else
+        st->st_atimensec = 0;
+        st->st_mtimensec = 0;
+        st->st_ctimensec = 0;
+        #endif
+    #else
+    st->st_atim.tv_nsec = 0;
         st->st_mtim.tv_nsec = 0;
         st->st_ctim.tv_nsec = 0;
+    #endif
 }
 
 int read_inode(ext2_ino_t ino, struct ext2_inode *inode)

src/fuse-ext2fs.c

@@ -64 +64 @@
                 fuse_reply_err(req, EROFS);
                 return;
         }
-        fuse_reply_err(req,
+    if (mask == 0){
+        //no prims == true
+        fuse_reply_err(req,0);
+    }
+    else{
+            fuse_reply_err(req,
                                 check_perms(fuse_req_ctx(req), EXT2FS_INO(ino), mask));
+    }
 }
 
 // This is basically stat/fstat/lstat

lib/ext2fs/imager.c

@@ -37 +37 @@
 #include "ext2fs.h"
 
 #ifndef HAVE_TYPE_SSIZE_T
+#if (__FreeBSD__ < 10)
 typedef int ssize_t;
 #endif
+#endif
 
 /*
  * This function returns 1 if the specified block is all zeros