ffi-libfuse 0.4.0 → 0.4.1

data/lib/ffi/flock.rb

@@ -18,32 +18,36 @@ module FFI
 
     include(Accessors)
 
-    layout(l_type: Enums::LockType, l_whence: Enums::SeekWhenceShort, l_start: :off_t, l_len: :off_t, l_pid: :pid_t)
-
-    l_members = members.grep(/^l_/).map { |m| m[2..].to_sym }
-
-    ffi_attr_reader(*l_members, format: 'l_%s')
-
-    # @!attribute [r] type
-    #   @return [Symbol] lock type, :rdlck, :wrlck, :unlck
-
-    # @!attribute [r] whence
-    #   @return [Symbol] specifies what the offset is relative to, one of :seek_set, :seek_cur or :seek_end
-    #    corresponding to the whence argument to fseek(2) or lseek(2),
-
-    # @!attribute [r] start
-    #  @return [Integer] the offset of the start of the region to which the lock applies, and is given in bytes
-    #   relative to the point specified by #{whence} member.
-
-    # @!attribute [r] len
-    #  @return [Integer] the length of the region to be locked.
-    #
-    #    A value of 0 means the region extends to the end of the file.
-
-    # @!attribute [r] pid
-    #  @return [Integer] the process ID (see Process Creation Concepts) of the process holding the lock.
-    #   It is filled in by calling fcntl with the F_GETLK command, but is ignored when making a lock. If the
-    #   conflicting lock is an open file description lock (see Open File Description Locks), then this field will be
-    #   set to -1.
+    layout(
+      # @!attribute [r] type
+      #   @return [Symbol] lock type, :rdlck, :wrlck, :unlck
+      l_type: Enums::LockType,
+
+      # @!attribute [r] whence
+      #   @return [Symbol] specifies what the offset is relative to, one of :seek_set, :seek_cur or :seek_end
+      #    corresponding to the whence argument to fseek(2) or lseek(2),
+      l_whence: Enums::SeekWhenceShort,
+
+      # @!attribute [r] start
+      #  @return [Integer] the offset of the start of the region to which the lock applies, and is given in bytes
+      #   relative to the point specified by #{whence} member.
+      l_start: :off_t,
+
+      # @!attribute [r] len
+      #  @return [Integer] the length of the region to be locked.
+      #
+      #    A value of 0 means the region extends to the end of the file.
+      l_len: :off_t,
+
+      # @!attribute [r] pid
+      #  @return [Integer] the process ID (see Process Creation Concepts) of the process holding the lock.
+      #   It is filled in by calling fcntl with the F_GETLK command, but is ignored when making a lock. If the
+      #   conflicting lock is an open file description lock (see Open File Description Locks), then this field will be
+      #   set to -1.
+      l_pid: :pid_t
+    )
+
+    # Strip leading 'l_' to make attribute names
+    ffi_attr_reader(**members.to_h { |m| [m[2..].to_sym, m] })
   end
 end

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

@@ -18,7 +18,7 @@ module FFI
           )
           return wrappers unless defined?(super)
 
-          super(*wrappers)
+          super
         end
 
         module_function

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

@@ -41,7 +41,7 @@ module FFI
           wrappers << proc { |fm, *args, &b| debug_callback(fm, *args, **conf, &b) } if debug?
           return wrappers unless defined?(super)
 
-          super(*wrappers)
+          super
         end
 
         # @!visibility private

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

@@ -12,27 +12,27 @@ module FFI
           if FUSE_MAJOR_VERSION == 2
             # @!visibility private
             def getattr(path, stat, fuse_file_info = nil)
-              super(path, stat, fuse_file_info)
+              super
             end
 
             def truncate(path, size, fuse_file_info = nil)
-              super(path, size, fuse_file_info)
+              super
             end
 
             def init(fuse_conn_info, fuse_config = nil)
-              super(fuse_conn_info, fuse_config)
+              super
             end
 
             def chown(path, uid, gid, fuse_file_info = nil)
-              super(path, uid, gid, fuse_file_info)
+              super
             end
 
             def chmod(path, mode, fuse_file_info = nil)
-              super(path, mode, fuse_file_info)
+              super
             end
 
             def utimens(path, times, fuse_file_info = nil)
-              super(path, times, fuse_file_info)
+              super
             end
 
             def readdir(path, buffer, filler, offset, fuse_file_info, fuse_readdir_flag = 0)
@@ -45,7 +45,7 @@ module FFI
               # fgetattr and ftruncate already fallback to the respective basic method
               return false if %i[getdir fgetattr ftruncate].include?(fuse_method)
 
-              super(fuse_method)
+              super
             end
 
             def fuse_options(args)

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

@@ -24,24 +24,24 @@ module FFI
             fi = args.pop
             return fgetattr(*args, fi) if fi && fuse_super_respond_to?(:fgetattr)
 
-            super(*args)
+            super
           end
 
           def truncate(*args)
             fi = args.pop
             return ftruncate(*args, fi) if fi && fuse_super_respond_to?(:ftruncate)
 
-            super(*args)
+            super
           end
 
           def chown(*args)
             args.pop
-            super(*args)
+            super
           end
 
           def chmod(*args)
             args.pop
-            super(*args)
+            super
           end
 
           # TODO: Fuse3 deprecated flag utime_omit_ok - which meant that UTIME_OMIT and UTIME_NOW are passed through
@@ -50,14 +50,14 @@ module FFI
           #  but there is no way to handle OMIT
           def utimens(*args)
             args.pop
-            super(*args) if defined?(super)
+            super if defined?(super)
           end
 
           def init(*args)
             args.pop
 
             # TODO: populate FuseConfig with output from fuse_flags/FuseConnInfo where appropriate
-            super(*args)
+            super
           end
 
           def readdir(*args, &block)
@@ -71,7 +71,7 @@ module FFI
               proc { |buf, name, stat, off| a.call(buf, name, stat, off, 0) }
             end
 
-            super(*args, &block)
+            super
           end
 
           def fuse_respond_to(fuse_callback)

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

@@ -20,7 +20,7 @@ module FFI
           }
           return wrappers unless defined?(super)
 
-          super(*wrappers)
+          super
         end
 
         module_function

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

@@ -15,7 +15,7 @@ module FFI
           }
           return wrappers unless defined?(super)
 
-          super(*wrappers)
+          super
         end
       end
     end

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

@@ -338,7 +338,7 @@ module FFI
 
           # Calls super if defined and storing result to protect from GC until {#destroy}
           def init(*args)
-            o = super(*args) if fuse_super_respond_to?(:init)
+            o = super if fuse_super_respond_to?(:init)
             handles << o if o
           end
 

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

@@ -23,7 +23,7 @@ module FFI
           }
           return wrappers unless defined?(super)
 
-          super(*wrappers)
+          super
         end
 
         # @return [Integer] the default errno to return for rescued errors.  ENOTRECOVERABLE unless overridden

data/lib/ffi/libfuse/filesystem/virtual_dir.rb

@@ -41,7 +41,7 @@ module FFI
 
         def initialize(accounting: Accounting.new)
           @entries = {}
-          super(accounting: accounting)
+          super
         end
 
         # @!endgroup
@@ -157,7 +157,7 @@ module FFI
             # TODO: Strictly should understand setgid and sticky bits of this dir's mode when creating new files
             new_file = file ? file.call(name) : new_file(name)
             if entry_fuse_respond_to?(new_file, :create)
-              new_file.public_send(:create, '/', mode, ffi)
+              new_file.create('/', mode, ffi)
             else
               # TODO: generate a sensible device number
               entry_send(new_file, :mknod, '/', mode, 0)

data/lib/ffi/libfuse/filesystem/virtual_file.rb

@@ -20,7 +20,7 @@ module FFI
 
           # Create an empty synthetic file
           def initialize(accounting: nil)
-            super(accounting: accounting)
+            super
           end
 
           # @!group FUSE Callbacks

data/lib/ffi/libfuse/filesystem/virtual_link.rb

@@ -12,7 +12,7 @@ module FFI
           include VirtualNode
           def initialize(accounting: nil)
             @target = target
-            super(accounting: accounting)
+            super
           end
 
           def readlink(_path, size)

data/lib/ffi/libfuse/fuse3.rb

@@ -58,12 +58,12 @@ module FFI
           cmdline_opts = FuseCmdlineOpts.new
           raise Error unless Libfuse.fuse_parse_cmdline3(args, cmdline_opts).zero?
 
-          handler&.fuse_debug(cmdline_opts.debug) if handler.respond_to?(:fuse_debug)
+          handler&.fuse_debug(cmdline_opts.debug?) if handler.respond_to?(:fuse_debug)
 
           # mimics fuse_main which exits after printing version info, even if -h
-          if cmdline_opts.show_version
+          if cmdline_opts.show_version?
             show_version(handler)
-          elsif cmdline_opts.show_help
+          elsif cmdline_opts.show_help?
             show_help(args, handler)
           end
 
@@ -145,8 +145,8 @@ module FFI
 
       private
 
-      def native_fuse_loop_mt(max_idle_threads: 10, **_options)
-        Libfuse.fuse_loop_mt3(@fuse, FuseLoopConfig.new.fill(max_idle: max_idle_threads))
+      def native_fuse_loop_mt(**options)
+        Libfuse.fuse_loop_mt3(@fuse, FuseLoopConfig.create(**options))
       end
 
       def unmount

data/lib/ffi/libfuse/fuse_args.rb

@@ -3,13 +3,17 @@
 require_relative 'fuse_version'
 require_relative 'fuse_opt'
 require_relative '../ruby_object'
+require_relative '../boolean_int'
+require_relative '../accessors'
 
 module FFI
   # Ruby FFI Binding for [libfuse](https://github.com/libfuse/libfuse)
   module Libfuse
     # struct fuse_args
     class FuseArgs < FFI::Struct
-      layout :argc, :int, :argv, :pointer, :allocated, :int
+      include FFI::Accessors
+
+      layout :argc, :int, :argv, :pointer, :allocated, :bool_int
 
       # Create a fuse_args struct from command line options
       # @param [Array<String>] argv command line args
@@ -34,33 +38,17 @@ module FFI
         @arg_vector[argv.size].put_pointer(0, FFI::Pointer::NULL)
         self[:argv] = @arg_vector
         self[:argc] = argv.size
-        self[:allocated] = 0
+        self[:allocated] = false # ie libfuse did not allocate
         self
       end
 
-      # @!attribute [r] argc
-      # @return [Integer] count of args
-      def argc
-        self[:argc]
-      end
-
       # @!attribute [r] argv
       # @return [Array<String>] list of args
-      def argv
+      ffi_attr_reader(:argv) do
         # noinspection RubyResolve
         self[:argv].get_array_of_pointer(0, argc).map(&:read_string)
       end
 
-      # @!visibility private
-      def allocated
-        self[:allocated]
-      end
-
-      # @!visibility private
-      def inspect
-        "#{self.class.name} - #{%i[argc argv allocated].to_h { |m| [m, send(m)] }}"
-      end
-
       # Add an arg to this arg list
       # @param [String] arg
       def add(arg)
@@ -151,6 +139,8 @@ module FFI
       # Valid return values from parse! block
       FUSE_OPT_PROC_RETURN = { error: -1, keep: 1, handled: 0, discard: 0 }.freeze
 
+      ffi_attr_reader(:argc, :allocated?)
+
       def fuse_opt_proc(symbols, bool_opts, param_opts, ignore, &block)
         proc do |data, arg, key, out|
           key = symbols[key]

data/lib/ffi/libfuse/fuse_cmdline_opts.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require_relative '../accessors'
+require_relative '../boolean_int'
 require_relative 'fuse_loop_config'
 module FFI
   module Libfuse
-    #
     # struct fuse_cmdline_opts {
     #   int singlethread;
     #   int foreground;
@@ -16,29 +16,32 @@ module FFI
     #   int clone_fd;
     #   unsigned int max_idle_threads;
     # };
+
+    # Command line options
     # @!visibility private
     class FuseCmdlineOpts < FFI::Struct
       include(FFI::Accessors)
 
-      layout(
-        single_thread: :int,
-        foreground: :int,
-        debug: :int,
-        nodefault_subtype: :int,
+      spec = {
+        single_thread: :bool_int,
+        foreground: :bool_int,
+        debug: :bool_int,
+        nodefault_subtype: :bool_int,
         mountpoint: :string,
-        show_version: :int,
-        show_help: :int,
-        clone_fd: :int,
-        max_idle_threads: :int
-      )
+        show_version: :bool_int,
+        show_help: :bool_int,
+        clone_fd: :bool_int,
+        max_idle_threads: :uint
+      }
+      spec[:max_threads] = :uint if FUSE_MINOR_VERSION >= 12
+
+      layout(spec)
 
-      # int to booleans
-      ffi_attr_reader(:single_thread, :foreground, :debug, :nodefault_subtype, :show_version, :show_help,
-                      :clone_fd) do |v|
-        v != 0
-      end
+      bool, = spec.partition { |_, v| v == :bool_int }
+      ffi_attr_reader(*bool.map { |k, _| "#{k}?" })
 
       ffi_attr_reader(:max_idle_threads, :mountpoint)
+      ffi_attr_reader(:max_threads) if FUSE_MINOR_VERSION >= 12
     end
   end
 end

data/lib/ffi/libfuse/fuse_config.rb

@@ -10,7 +10,7 @@ module FFI
     # This structure is initialized from the arguments passed to fuse_new(), and then passed to the file system's init()
     # handler which should ensure that the configuration is compatible with the file system implementation.
     #
-    # Some options can only be set via the filesystem init method (use_ino etc..) because the filesystem either
+    # Some options can only be set via the filesystem init method (:use_ino etc..) because the filesystem either
     # supports them or it doesn't.
     class FuseConfig < FFI::Struct
       include FFI::Accessors
@@ -40,7 +40,7 @@ module FFI
           # @!attribute [rw] negative_timeout
           # The timeout in seconds for which a negative lookup will be cached.
           #
-          # This means, that if file did not exist (lookup retuned ENOENT), the lookup will only be redone after the
+          # This means, that if file did not exist (lookup returned ENOENT), the lookup will only be redone after the
           # timeout, and the file/directory will be assumed to not exist until then. A value of zero means that
           # negative lookups are not cached.
           #
@@ -55,7 +55,7 @@ module FFI
           # @return [Float]
           attr_timeout: :double,
 
-          # @!attribute [rw] intr
+          # @!attribute [rw] intr?
           # Allow requests to be interrupted
           # @return [Boolean]
           intr: :bool_int,
@@ -80,7 +80,7 @@ module FFI
           # @return [Integer]
           remember: :int,
 
-          # @!attribute [rw] hard_remove
+          # @!attribute [rw] hard_remove?
           # should open files be removed immediately
           #
           # The default behavior is that if an open file is deleted, the file is renamed to a hidden file
@@ -95,7 +95,7 @@ module FFI
           # @return [Boolean]
           hard_remove: :bool_int,
 
-          # @!attribute [rw] use_ino
+          # @!attribute [rw] use_ino?
           # use filesystem provided inode values
           #
           # Honor the st_ino field in the functions getattr() and fill_dir(). This value is used to fill in the st_ino
@@ -109,8 +109,8 @@ module FFI
           # @return [Boolean]
           use_ino: :bool_int,
 
-          # @!attribute [rw] readdir_ino
-          # generate inodes for readdir even if {#use_ino} is set
+          # @!attribute [rw] readdir_ino?
+          # generate inodes for readdir even if {#use_ino?} is set
           #
           # If use_ino option is not given, still try to fill in the d_ino field in readdir(2). If the name was
           # previously looked up, and is still in the cache, the inode number found there will be used.  Otherwise it
@@ -118,7 +118,7 @@ module FFI
           # @return [Boolean]
           readdir_ino: :bool_int,
 
-          # @!attribute [rw] direct_io
+          # @!attribute [rw] direct_io?
           # disables the use of kernel page cache (file content cache) in the kernel for this filesystem.
           #
           # This has several affects:
@@ -135,13 +135,13 @@ module FFI
           # @return [Boolean]
           direct_io: :bool_int,
 
-          # @!attribute [rw] kernel_cache
+          # @!attribute [rw] kernel_cache?
           # disables flushing the cache of the file contents on every open(2).
           #
           # This should only be enabled on filesystem where the file data is never changed externally (not through the
           # mounted FUSE filesystem).  Thus it is not suitable for network filesystem and other intermediate filesystem.
           #
-          # **Note**:  if neither this option or {#direct_io} is specified data is still cached after the open(2),
+          # **Note**:  if neither this option or {#direct_io?} is specified data is still cached after the open(2),
           # so a read(2) system call will not always initiate a read operation.
           #
           # Internally, enabling this option causes fuse to set {FuseFileInfo#keep_cache} overwriting any value that was
@@ -149,7 +149,7 @@ module FFI
           # @return [Boolean]
           kernel_cache: :bool_int,
 
-          # @!attribute [rw] auto_cache
+          # @!attribute [rw] auto_cache?
           # invalidate cached data on open based on changes in file attributes
           #
           # This option is an alternative to `kernel_cache`. Instead of unconditionally keeping cached data, the cached
@@ -165,7 +165,7 @@ module FFI
           ac_attr_timeout_set: :bool_int,
           ac_attr_timeout: :double,
 
-          # @!attribute [rw] nullpath_ok
+          # @!attribute [rw] nullpath_ok?
           # operations on open files and directories are ok to receive nil paths
           #
           # If this option is given the file-system handlers for the following operations will not receive path
@@ -185,21 +185,24 @@ module FFI
       layout(spec)
 
       # Find the attrs that have a corresponding setter (prefix set_ or suffix _set
+      # map attr => setter
       setters = spec.keys
-                    .map { |k| [k, k.to_s.sub(/^set_/, '').sub(/_set$/, '').to_sym] }
-                    .reject { |(s, a)| s == a }.to_h
+                    .map { |k| [k.to_s.sub(/^set_/, '').sub(/_set$/, '').to_sym, k] }
+                    .reject { |(s, a)| s == a }
+                    .to_h
 
-      setters.each do |(setter, attr)|
-        ffi_attr_reader(attr) { |val| self[setter] ? val : nil }
+      ffi_attr_reader_method(*setters.keys) do
+        self[setters[__method__]] ? self[__method__] : nil
+      end
 
-        ffi_attr_writer(attr) do |val|
-          self[setter] = !val.nil?
-          val || 0
-        end
+      ffi_attr_writer_method(*setters.keys) do |val|
+        self[setters[__method__]] = !val.nil?
+        self[__method__] = val || 0
       end
 
-      remaining = (spec.keys - setters.keys - setters.values).map { |a| spec[a] == :bool_int ? "#{a}?" : a }
-      ffi_attr_accessor(*remaining)
+      ffi_attr_reader(:show_help?, :debug?)
+      remaining = (spec.keys - setters.keys - setters.values - %i[show_help modules debug])
+      ffi_attr_accessor(*remaining.map { |a| spec[a] == :bool_int ? "#{a}?" : a })
     end
   end
 end

data/lib/ffi/libfuse/fuse_conn_info.rb

@@ -326,7 +326,7 @@ module FFI
       #   or unwanted
       # @return [Array<Symbol>]
       # @see capable
-      ffi_attr_reader(:want, simple: false) do |*caps, **h|
+      ffi_attr_reader_method(:want) do |*caps, **h|
         next self[:want] if caps.empty? && h.empty?
 
         h.merge!(caps.pop) if caps.last.is_a?(Hash)

data/lib/ffi/libfuse/fuse_context.rb

@@ -15,7 +15,8 @@ module FFI
       base[:umask] = :mode_t if FUSE_VERSION >= 28
       layout base
 
-      ffi_attr_reader(*members, simple: false) do
+      # Define readers, safe from null access
+      ffi_attr_reader_method(*members) do
         m = __method__
 
         # Use overrides if they are available, or the default context if the underlying memory is invalid