fixup! [fix] Fix FUSE struct issues on NetBSD

Author: mxmlnkn

mfusepy.py

@@ -158,14 +158,6 @@ def get_fuse_version(libfuse):
         f"Found library {_libfuse_path} has wrong major version: {fuse_version_major}. Expected FUSE 2!"
     )
 
-print("FOUND FUSE LIBRARY VERSION:", fuse_version_major, fuse_version_minor)
-
-if _system == 'NetBSD' and (fuse_version_major, fuse_version_minor) == (2, 9):
-    # For some reason, NetBSD return 2.9 even though the API is 3.10!
-    # The correct version is important for the struct layout!
-    # https://github.com/NetBSD/src/blob/netbsd-10/lib/librefuse/fuse.h#L58-L59
-    fuse_version_major = 3
-    fuse_version_minor = 10
 
 # Some platforms, like macOS 15, define ENOATTR and ENODATA with different values.
 # For missing xattrs, errno is set to the ENOATTR value (e.g. in getxattr and removexattr).
@@ -943,10 +935,14 @@ class fuse_bufvec(ctypes.Structure):
     ('proto_major', ctypes.c_uint),
     ('proto_minor', ctypes.c_uint),
 ]
+# For some reason, NetBSD return 2.9 even though the API is 3.10!
+# The correct version is important for the struct layout!
+# https://github.com/NetBSD/src/blob/netbsd-10/lib/librefuse/fuse.h#L58-L59
+# However, the fuse_operations layout probably fits the advertised version because I had segfaults from utimens!
 if fuse_version_major == 2 or _system == 'NetBSD':  # No idea why NetBSD did not remove it -.-
     _fuse_conn_info_fields += [('async_read', _fuse_uint32)]
 _fuse_conn_info_fields += [('max_write', _fuse_uint32)]
-if fuse_version_major == 3:
+if fuse_version_major == 3 or _system == 'NetBSD':
     _fuse_conn_info_fields += [('max_read', _fuse_uint32)]
 _fuse_conn_info_fields += [
     ('max_readahead', _fuse_uint32),
@@ -955,11 +951,11 @@ class fuse_bufvec(ctypes.Structure):
     ('max_background', _fuse_uint32),  # Added in 2.9
     ('congestion_threshold', _fuse_uint32),  # Added in 2.9
 ]
-if fuse_version_major == 2:
+if fuse_version_major == 2 and _system != 'NetBSD':
     _fuse_conn_info_fields += [('reserved', _fuse_uint32 * 23)]
-elif fuse_version_major == 3:
+elif fuse_version_major == 3 or _system == 'NetBSD':
     _fuse_conn_info_fields += [('time_gran', _fuse_uint32)]
-    if fuse_version_minor < 17:
+    if fuse_version_minor < 17 or _system == 'NetBSD':
         _fuse_conn_info_fields += [('reserved', _fuse_uint32 * 22)]
     else:
         _fuse_conn_info_fields += [
@@ -1037,11 +1033,12 @@ class fuse_conn_info(ctypes.Structure):  # Added in 2.6 (ABI break of "init" fro
     if fuse_version_minor >= 15 and fuse_version_minor < 17:
         _fuse_config_fields_ += [('parallel_direct_writes', ctypes.c_int)]
 
-    _fuse_config_fields_ += [
-        ('show_help', _fuse_int32),
-        ('modules', ctypes.c_char_p),
-        ('debug', _fuse_int32),
-    ]
+    if _system != 'NetBSD':
+        _fuse_config_fields_ += [
+            ('show_help', _fuse_int32),
+            ('modules', ctypes.c_char_p),
+            ('debug', _fuse_int32),
+        ]
 
     if fuse_version_minor >= 17:
         _fuse_config_fields_ += [