ffi-libfuse 0.0.1.rctest12 → 0.3.3

data/lib/ffi/libfuse/adapter/fuse2_compat.rb

@@ -5,77 +5,78 @@ module FFI
     module Adapter
       # Wrapper module to assist filesystem written for Fuse3 to be compatible with Fuse2
       module Fuse2Compat
-        # @!visibility private
         # Wrapper shim for fuse methods to ensure compatibility with Fuse2
-        module Fuse2Prepend
+        module Prepend
           include Adapter
 
-          def getattr(path, stat, fuse_file_info = nil)
-            super(path, stat, fuse_file_info)
-          end
-
-          def truncate(path, size, fuse_file_info = nil)
-            super(path, size, fuse_file_info)
-          end
+          if FUSE_MAJOR_VERSION == 2
+            # @!visibility private
+            def getattr(path, stat, fuse_file_info = nil)
+              super(path, stat, fuse_file_info)
+            end
 
-          def init(fuse_conn_info, fuse_config = nil)
-            super(fuse_conn_info, fuse_config)
-          end
+            def truncate(path, size, fuse_file_info = nil)
+              super(path, size, fuse_file_info)
+            end
 
-          def chown(path, uid, gid, fuse_file_info = nil)
-            super(path, uid, gid, fuse_file_info)
-          end
+            def init(fuse_conn_info, fuse_config = nil)
+              super(fuse_conn_info, fuse_config)
+            end
 
-          def chmod(path, mode, fuse_file_info = nil)
-            super(path, mode, fuse_file_info)
-          end
+            def chown(path, uid, gid, fuse_file_info = nil)
+              super(path, uid, gid, fuse_file_info)
+            end
 
-          def utimens(path, atime, mtime, fuse_file_info = nil)
-            super(path, atime, mtime, fuse_file_info)
-          end
+            def chmod(path, mode, fuse_file_info = nil)
+              super(path, mode, fuse_file_info)
+            end
 
-          def readdir(path, buffer, filler, offset, fuse_file_info, fuse_readdir_flag = 0)
-            filler = proc { |buf, name, stat, off = 0, _fuse_fill_dir_flag = 0| filler.call(buf, name, stat, off) }
-            super(path, buffer, filler, offset, fuse_file_info, fuse_readdir_flag)
-          end
+            def utimens(path, atime, mtime, fuse_file_info = nil)
+              super(path, atime, mtime, fuse_file_info)
+            end
 
-          def fgetattr(*args)
-            getattr(*args)
-          end
+            def readdir(path, buffer, filler, offset, fuse_file_info, fuse_readdir_flag = 0)
+              f3_fill = proc { |buf, name, stat, off = 0, _fuse_fill_dir_flag = 0| filler.call(buf, name, stat, off) }
+              super(path, buffer, f3_fill, offset, fuse_file_info, fuse_readdir_flag)
+            end
 
-          def ftruncate(*args)
-            truncate(*args)
-          end
+            def fgetattr(path, stat, ffi)
+              stat.clear # For some reason (at least on OSX) the stat is not clear when this is called.
+              getattr(path, stat, ffi)
+              0
+            end
 
-          def fuse_respond_to?(fuse_method)
-            fuse_method = fuse_method[1..].to_sym if %i[fgetattr ftruncate].include?(fuse_method)
-            super(fuse_method)
-          end
+            def ftruncate(*args)
+              truncate(*args)
+            end
 
-          def fuse_flags
-            res = defined?(super) ? super : []
-            if respond_to?(:init_fuse_config)
-              fuse_config = FuseConfig.new
-              init_fuse_config(fuse_config, :fuse2)
-              res << :nullpath_ok if fuse_config.nullpath_ok?
+            def fuse_respond_to?(fuse_method)
+              fuse_method = fuse_method[1..].to_sym if %i[fgetattr ftruncate].include?(fuse_method)
+              super(fuse_method)
             end
 
-            res
-          end
-        end
+            def fuse_flags
+              res = defined?(super) ? super : []
+              if respond_to?(:init_fuse_config)
+                fuse_config = FuseConfig.new
+                init_fuse_config(fuse_config, :fuse2)
+                res << :nullpath_ok if fuse_config.nullpath_ok?
+              end
 
-        # @!visibility private
-        module Fuse3Prepend
-          def init(*args)
-            init_fuse_config(args.detect { |a| a.is_a?(FuseConfig) }) if respond_to?(:init_fuse_config)
-            super if defined?(super)
+              res
+            end
+
+          else
+            def init(*args)
+              init_fuse_config(args.detect { |a| a.is_a?(FuseConfig) }) if respond_to?(:init_fuse_config)
+              super if defined?(super)
+            end
           end
         end
 
         # @!visibility private
         def self.included(mod)
-          prepend_module = Libfuse.FUSE_MAJOR_VERSION == 2 ? Fuse2Prepend : Fuse3Prepend
-          mod.prepend(prepend_module)
+          mod.prepend(Prepend)
         end
 
         # @!method init_fuse_config(fuse_config,compat)

data/lib/ffi/libfuse/adapter/fuse3_support.rb

@@ -12,7 +12,6 @@ module FFI
       #
       module Fuse3Support
         # The actual module methods that are prepended
-        # @!visibility private
         module Prepend
           include Adapter
 
@@ -23,14 +22,14 @@ module FFI
 
           def getattr(*args)
             fi = args.pop
-            return fgetattr(*args, fi) if fi && respond_to?(:fgetattr)
+            return fgetattr(*args, fi) if fi && fuse_super_respond_to?(:fgetattr)
 
             super(*args)
           end
 
           def truncate(*args)
             fi = args.pop
-            return ftruncate(*args, fi) if fi && respond_to?(:ftruncate)
+            return ftruncate(*args, fi) if fi && fuse_super_respond_to?(:ftruncate)
 
             super(*args)
           end
@@ -51,7 +50,7 @@ module FFI
           #  but there is no way to handle OMIT
           def utimens(*args)
             args.pop
-            super(*args)
+            super(*args) if defined?(super)
           end
 
           def init(*args)
@@ -74,6 +73,10 @@ module FFI
 
             super(*args, &block)
           end
+
+          def fuse_respond_to(fuse_callback)
+            super || (%i[truncate getattr].include?(fuse_callback) && fuse_super_respond_to?("f#{fuse_callback}"))
+          end
         end
 
         # @!visibility private

data/lib/ffi/libfuse/adapter/interrupt.rb

@@ -27,7 +27,7 @@ module FFI
 
         # @raise [Errno::EINTR] if the fuse request is marked as interrupted
         def interrupt_callback(*args)
-          return -Errno::EINTR::Errno if Libfuse.fuse_interrupted?
+          Libfuse.raise_interrupt
 
           yield(*args)
         end