Fix fusefs on macos

* Fix si-fs project building for mac in buck2
* Added libfuse to fuser features
* Switch EBADFD to EBADF for cross platform bad file descriptor
* Pass additional link args on mac so the rust binary can link the the macfuse symbols
* Fixed old fixup format

Author: JakeGinnivan

bin/si-fs/BUCK

@@ -16,6 +16,10 @@ rust_binary(
     ],
     srcs = glob(["src/**/*.rs"]),
     env = {"CARGO_BIN_NAME": "si-fs"},
+    rustc_flags = select({
+        "config//os:macos": ["-C", "link-arg=-L/usr/local/lib", "-C", "link-arg=-lfuse"],
+        "DEFAULT": [],
+    }),
 )
 
 rust_binary_pkg(

bin/si-fs/README.md

@@ -12,7 +12,7 @@ A FUSE filesystem for editing System Initiative assets in your favorite editor.
 2. Mount the filesystem:
 
 ```bash
-buck2 run //bin/si-fs -- --foreground --workspace-id <WORKSPACE_ID> --endpoint <ENDPOINT> /mountpoint
+buck2 run //bin/si-fs -- --foreground --workspace-id <WORKSPACE_ID> [--endpoint <ENDPOINT>] /mountpoint
 ```
 
 At this point, we recommend running in the foreground, so you can see any errors
@@ -125,3 +125,13 @@ The function must be on the same change set as the schema you are attaching to.
 
 Like when creating a new function, Attribute and Action functions will be put
 into a pending state.
+
+## Mac Setup
+
+Ensure you setup macFUSE before attempting above setup
+ https://github.com/macfuse/macfuse/wiki/Getting-Started
+
+You will need to use a mountpoint in your user profile otherwise you will get `std io error: Read-only file system (os error 30)` when trying to write to the filesystem.
+
+eg. `buck2 run //bin/si-fs -- --foreground --workspace-id <WORKSPACE_ID> ~/si-mount`
+

lib/si-filesystem/src/lib.rs

@@ -57,7 +57,7 @@ use inode_table::{
 use nix::{
     libc::{
         EACCES,
-        EBADFD,
+        EBADF,
         EINVAL,
         ENODATA,
         ENOENT,
@@ -1686,7 +1686,7 @@ impl SiFileSystem {
             };
 
             let Some(mut open_file) = self.open_files.get_mut(&fh) else {
-                reply.error(EBADFD);
+                reply.error(EBADF);
                 return Ok(());
             };
 

prelude/rust/cargo_buildscript.bzl

@@ -196,6 +196,12 @@ def buildscript_run(
             for path in glob(["{}/**".format(local_manifest_dir)])
         }
 
+    # platform is not supported by the _cargo_buildscript_rule function, so remove it before adding the target
+    #   The error without this - error: Found `platform` extra named parameter(s) for call to _cargo_buildscript_rule
+    #
+    # not sure how to stop it being added by reindeer
+    kwargs.pop("platform", None)
+
     _cargo_buildscript_rule(
         name = name,
         buildscript = buildscript_rule,

third-party/rust/BUCK

@@ -6941,6 +6941,22 @@ cargo.rust_library(
     env = {
         "OUT_DIR": "$(location :fuser-0.16.0-build-script-run[out_dir])",
     },
+    platform = {
+        "macos-arm64": dict(
+            features = [
+                "default",
+                "libfuse",
+                "pkg-config",
+            ],
+        ),
+        "macos-x86_64": dict(
+            features = [
+                "default",
+                "libfuse",
+                "pkg-config",
+            ],
+        ),
+    },
     rustc_flags = ["@$(location :fuser-0.16.0-build-script-run[rustc_flags])"],
     visibility = [],
     deps = [
@@ -6960,13 +6976,47 @@ cargo.rust_binary(
     crate = "build_script_build",
     crate_root = "fuser-0.16.0.crate/build.rs",
     edition = "2024",
+    platform = {
+        "macos-arm64": dict(
+            features = [
+                "default",
+                "libfuse",
+                "pkg-config",
+            ],
+            deps = [":pkg-config-0.3.32"],
+        ),
+        "macos-x86_64": dict(
+            features = [
+                "default",
+                "libfuse",
+                "pkg-config",
+            ],
+            deps = [":pkg-config-0.3.32"],
+        ),
+    },
     visibility = [],
 )
 
 buildscript_run(
     name = "fuser-0.16.0-build-script-run",
     package_name = "fuser",
     buildscript_rule = ":fuser-0.16.0-build-script-build",
+    platform = {
+        "macos-arm64": dict(
+            features = [
+                "default",
+                "libfuse",
+                "pkg-config",
+            ],
+        ),
+        "macos-x86_64": dict(
+            features = [
+                "default",
+                "libfuse",
+                "pkg-config",
+            ],
+        ),
+    },
     version = "0.16.0",
 )
 

third-party/rust/Cargo.lock

@@ -208,3 +208,6 @@ spicedb-grpc = { git = "https://github.com/systeminit/spicedb-client.git", branc
 tokio-postgres-rustls = { git = "https://github.com/jbg/tokio-postgres-rustls.git", branch = "master" }
 
 # END: DEPENDENCIES
+
+[target.'cfg(target_os = "macos")'.dependencies]
+fuser = { version = "0.16.0", features = ["libfuse", "pkg-config"] }

third-party/rust/Cargo.toml

@@ -1,7 +1,7 @@
 buildscript.run = false
 
-[platform_fixup.'cfg(target_os = "windows")']
+['cfg(target_os = "windows")']
 buildscript.run = true
-[platform_fixup.'cfg(target_os = "windows")'.buildscript.prebuilt_cxx_library]
+['cfg(target_os = "windows")'.buildscript.prebuilt_cxx_library]
 name = "libwindows.a"
 static_libs = ["lib/libwindows.a"]

third-party/rust/fixups/windows_aarch64_gnullvm/fixups.toml

@@ -1,7 +1,7 @@
 buildscript.run = false
 
-[platform_fixup.'cfg(target_os = "windows")']
+['cfg(target_os = "windows")']
 buildscript.run = true
-[platform_fixup.'cfg(target_os = "windows")'.buildscript.prebuilt_cxx_library]
+['cfg(target_os = "windows")'.buildscript.prebuilt_cxx_library]
 name = "libwindows.a"
 static_libs = ["lib/libwindows.a"]