ffi-libfuse 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791ea233a078177b2dd6a9b1cf9a75a64ed05d243de71ebf52a8028b11795653
-  data.tar.gz: 45d9d235948d5c4cdd09cd8ae168914e82caad31df8a2ce1727d8ed6bb2ff9ad
+  metadata.gz: ec6fbc45e44267c8b9a5515e5c504c132d8bc3f84155beeeb4b53832fda8add6
+  data.tar.gz: ef54c7d9820fe3449419e9880f2959f4c9524c0136f2a9d570038fe150efcb9d
 SHA512:
-  metadata.gz: '00301169c26144390a94545130326eb20c4661af57c2fd612f2ba477ba957b1f76e316fafb7f6da41431a97bab3a6e05523dd9d40a6f1f276d956e2f04aecf5a'
-  data.tar.gz: a3ea2914410e7f2c4e284df9a0ed500a0c70adc59504bfd93dd398b1396be1467f07071b20d2b7bfd68be465e6c1151889975d747b33969d9a53bff9e9561f47
+  metadata.gz: bc88763ee5ad1bc5a47b0314c78adbb4c28b531647f2b074f143302dfa1ea26ea724d83a5340c4ea54aeaeb00c6ef6b0d5a4a8dd383f02db697a65b8eed32780
+  data.tar.gz: f2090ddf215602e5b3b7f5ef7a09607b4dfd30e7e4ac661487b1c2ca5d6bdf39fa9aa85bb19d8e04c39a9f1c96be7d324a0a5d31676f6144fff9751dbb8175d1

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.4.4](https://github.com/lwoggardner/ffi-libfuse/compare/v0.4.3...v0.4.4) (2024-12-29)
+
+
+### Bug Fixes
+
+* fuse buffer adding NUL character when creating from a String ([#35](https://github.com/lwoggardner/ffi-libfuse/issues/35)) ([e07ebfe](https://github.com/lwoggardner/ffi-libfuse/commit/e07ebfeff4001a7d48ad457604e9f5f9191f96de)), closes [#34](https://github.com/lwoggardner/ffi-libfuse/issues/34)
+
+## [0.4.3](https://github.com/lwoggardner/ffi-libfuse/compare/v0.4.2...v0.4.3) (2024-12-25)
+
+
+### Miscellaneous Chores
+
+* release 0.4.3 ([341e2ce](https://github.com/lwoggardner/ffi-libfuse/commit/341e2ce3a2cf362bf2bdc2433ea0d1e1c843775c))
+
+## [0.4.2](https://github.com/lwoggardner/ffi-libfuse/compare/v0.4.1...v0.4.2) (2024-12-16)
+
+
+### Bug Fixes
+
+* bugs in Adapter::Safe and virtual filesystem operations ([decf7ae](https://github.com/lwoggardner/ffi-libfuse/commit/decf7ae024eee4bb565f67abfe493a14e5fa9cca))
+
 ## [0.4.1](https://github.com/lwoggardner/ffi-libfuse/compare/v0.4.0...v0.4.1) (2024-10-26)
 
 

data/README.md

@@ -4,7 +4,7 @@ Ruby FFI Binding for [libfuse](https://github.com/libfuse/libfuse)
 
 ## Requirements
 
-  * Ruby 2.7
+  * Ruby 2.7, 3.2+
   * Linux: libfuse (Fuse2) or libfuse3 (Fuse3)
   * MacOS: macFuse (https://osxfuse.github.io/)
 

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

@@ -60,17 +60,18 @@ module FFI
         #   For void callbacks
         # @return [Integer]
         #   For path callbacks,  either 0 for success or a negative errno value
-        def safe_callback(fuse_method, *args, default_errno: Errno::ENOTRECOVERABLE::Errno)
+        def safe_callback(fuse_method, *args, default_errno: Errno::ENOTRECOVERABLE::Errno, &block)
           if FuseOperations::MEANINGFUL_RETURN.include?(fuse_method)
-            safe_meaningful_integer_callback(fuse_method, *args, default_errno: default_errno)
+            safe_meaningful_integer_callback(fuse_method, *args, default_errno: default_errno, &block)
           elsif FuseOperations::VOID_RETURN.include?(fuse_method)
-            safe_void_callback(fuse_method, *args)
+            safe_void_callback(fuse_method, *args, &block)
           else
-            safe_integer_callback(fuse_method, *args, default_errno: default_errno)
+            safe_integer_callback(fuse_method, *args, default_errno: default_errno, &block)
           end
         end
 
-        private
+        # private
+        # @visibility private
 
         def safe_integer_callback(_, *args, default_errno: Errno::ENOTRECOVERABLE::Errno)
           safe_errno(default_errno) do
@@ -78,20 +79,23 @@ module FFI
             result.is_a?(Integer) && result.negative? ? result : 0
           end
         end
+        private_class_method :safe_integer_callback
 
         def safe_meaningful_integer_callback(_, *args, default_errno: Errno::ENOTRECOVERABLE::Errno)
           safe_errno(default_errno) do
             yield(*args).to_i
           end
         end
+        private_class_method :safe_meaningful_integer_callback
 
         def safe_errno(default_errno)
           yield
         rescue SystemCallError => e
           -e.errno
-        rescue StandardError, ScriptError
+        rescue StandardError, ScriptError => _e
           -default_errno.abs
         end
+        private_class_method :safe_errno
 
         # Process callbacks that return void, simply by swallowing unexpected errors
         def safe_void_callback(_, *args)
@@ -101,6 +105,7 @@ module FFI
           # Swallow unexpected exceptions
           nil
         end
+        private_class_method :safe_void_callback
       end
     end
   end

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

@@ -28,7 +28,7 @@ module FFI
         def getattr(path, stat = nil, _ffi = nil)
           return super unless root?(path)
 
-          stat&.directory(@root.virtual_stat.merge({ nlink: entries.size + 2 }))
+          stat&.directory(**@root.virtual_stat.merge({ nlink: entries.size + 2 }))
 
           self
         end

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

@@ -20,6 +20,7 @@ module FFI
 
           # Create an empty synthetic file
           def initialize(accounting: nil)
+            @nlink = 1
             super
           end
 

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

@@ -75,7 +75,7 @@ module FFI
           end
 
           def listxattr(path, buf = nil, size = nil)
-            return path_method(__method__, path) unless root?(path)
+            return path_method(__method__, path, buf, size) unless root?(path)
             return virtual_xattr.keys unless buf
 
             Adapter::Ruby.listxattr(buf, size) { virtual_xattr.keys }

data/lib/ffi/libfuse/fuse_buf.rb

@@ -59,7 +59,7 @@ module FFI
 
       # @overload fill(str:)
       #   Create a memory buffer from str
-      #   @param [String,#to_s] str
+      #   @param [String] str
       #
       # @overload fill(size:)
       #   Allocate an empty memory buffer of size bytes
@@ -86,12 +86,11 @@ module FFI
       # @return [self]
       def fill(
         str: nil,
-        mem: str ? FFI::MemoryPointer.from_string(str.to_s) : FFI::Pointer::NULL, size: mem.null? ? 0 : mem.size,
+        mem: mem_from_bytes(str),
+        size: mem.null? ? 0 : mem.size,
         fd: -1, fd_retry: false, pos: nil # rubocop:disable Naming/MethodParameterName
-
       )
-
-        # Allocate size bytes if we've been given a null pointer
+        # Allocate size bytes if we've been given a null pointer and size is > 0
         mem = FFI::MemoryPointer.new(:char, size, true) if fd == -1 && mem.null? && size.positive?
 
         mem.autorelease = to_ptr.autorelease? unless mem.null?
@@ -107,6 +106,15 @@ module FFI
         self[:pos] = pos || 0
         self
       end
+
+      private
+
+      def mem_from_bytes(str)
+        return FFI::Pointer::NULL unless str
+        return FFI::Pointer::NULL if str.empty?
+
+        FFI::MemoryPointer.new(:char, str.bytesize).write_bytes(str)
+      end
     end
   end
 end

data/lib/ffi/libfuse/fuse_common.rb

@@ -147,7 +147,7 @@ module FFI
           # close/redirect file descriptors
           $stdin.close
 
-          [$stdout, $stderr].each { |io| io.reopen('/dev/null', 'w') }
+          [$stdout, $stderr].each { |io| io.reopen(File::NULL, 'w') }
 
           pw.write([0].pack('c'))
         ensure

data/lib/ffi/libfuse/version.rb

@@ -3,6 +3,6 @@
 module FFI
   # Ruby FFI Binding for [libfuse](https://github.com/libfuse/libfuse)
   module Libfuse
-    VERSION = '0.4.1'
+    VERSION = '0.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libfuse
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Grant Gardner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-26 00:00:00.000000000 Z
+date: 2024-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - grant@lastweekend.com.au
 executables: []
@@ -200,13 +200,13 @@ files:
 - sample/memory_fs.rb
 - sample/no_fs.rb
 - sample/pass_through_fs.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/lwoggardner/ffi-libfuse
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: FFI Bindings for Libfuse
 test_files: []