refactor: replace NativeString with Box<NativeStr>

Author: branchseer

Cargo.lock

@@ -49,11 +49,11 @@ ctor = { workspace = true }
 test-log = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "fs", "io-std"] }
 
-[target.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.dev-dependencies]
-fspy_test_bin = { path = "../fspy_test_bin", artifact = "bin", target = "aarch64-unknown-linux-musl" }
+# [target.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.dev-dependencies]
+# fspy_test_bin = { path = "../fspy_test_bin", artifact = "bin", target = "aarch64-unknown-linux-musl" }
 
-[target.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.dev-dependencies]
-fspy_test_bin = { path = "../fspy_test_bin", artifact = "bin", target = "x86_64-unknown-linux-musl" }
+# [target.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.dev-dependencies]
+# fspy_test_bin = { path = "../fspy_test_bin", artifact = "bin", target = "x86_64-unknown-linux-musl" }
 
 [build-dependencies]
 anyhow = { workspace = true }

crates/fspy/Cargo.toml

@@ -8,7 +8,7 @@ use std::{io, path::Path};
 
 #[cfg(target_os = "linux")]
 use fspy_seccomp_unotify::supervisor::supervise;
-use fspy_shared::ipc::{NativeString, PathAccess, channel::channel};
+use fspy_shared::ipc::{NativeStr, PathAccess, channel::channel};
 #[cfg(target_os = "macos")]
 use fspy_shared_unix::payload::Artifacts;
 use fspy_shared_unix::{
@@ -28,12 +28,12 @@ use crate::{
     ipc::{OwnedReceiverLockGuard, SHM_CAPACITY},
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct SpyImpl {
     #[cfg(target_os = "macos")]
     artifacts: Artifacts,
 
-    preload_path: NativeString,
+    preload_path: Box<NativeStr>,
 }
 
 const PRELOAD_CDYLIB_BINARY: &[u8] = include_bytes!(env!("CARGO_CDYLIB_FILE_FSPY_PRELOAD_UNIX"));

crates/fspy/src/unix/mod.rs

@@ -1,7 +1,9 @@
 pub mod convert;
 pub mod raw_exec;
 
-use std::{fmt::Debug, num::NonZeroUsize, sync::OnceLock};
+use std::{
+    ffi::OsStr, fmt::Debug, num::NonZeroUsize, os::unix::ffi::OsStrExt as _, sync::OnceLock,
+};
 
 use bincode::{enc::write::SizeWriter, encode_into_slice, encode_into_writer};
 use convert::{ToAbsolutePath, ToAccessMode};
@@ -55,7 +57,7 @@ impl Client {
             // ipc channel not available, skip sending
             return Ok(());
         };
-        let path = path_access.path.as_bstr();
+        let path = path_access.path.as_os_str().as_bytes();
         if path.starts_with(b"/dev/")
             || (cfg!(target_os = "linux")
                 && (path.starts_with(b"/proc/") || path.starts_with(b"/sys/")))
@@ -101,7 +103,7 @@ impl Client {
                 let Some(abs_path) = abs_path else {
                     return Ok(Ok(()));
                 };
-                Ok(self.send(PathAccess { mode, path: abs_path.into() }))
+                Ok(self.send(PathAccess { mode, path: OsStr::from_bytes(abs_path).into() }))
             })
         }??;
 

crates/fspy_preload_unix/src/client/mod.rs

@@ -9,7 +9,7 @@ allocator-api2 = { workspace = true }
 bincode = { workspace = true }
 bitflags = { workspace = true }
 bstr = { workspace = true }
-bytemuck = { workspace = true, features = ["must_cast"] }
+bytemuck = { workspace = true, features = ["must_cast", "derive"] }
 shared_memory = { workspace = true, features = ["logging"] }
 thiserror = { workspace = true }
 tracing = { workspace = true }

crates/fspy_shared/Cargo.toml

@@ -11,12 +11,12 @@ use shm_io::{ShmReader, ShmWriter};
 use tracing::debug;
 use uuid::Uuid;
 
-use super::NativeString;
+use super::NativeStr;
 
 /// Serializable configuration to create channel senders.
 #[derive(Encode, Decode, Clone, Debug)]
 pub struct ChannelConf {
-    lock_file_path: NativeString,
+    lock_file_path: Box<NativeStr>,
     shm_id: Arc<str>,
     shm_size: usize,
 }
@@ -69,7 +69,7 @@ impl ChannelConf {
 
 pub struct Sender {
     writer: ShmWriter<Shmem>,
-    lock_file_path: NativeString,
+    lock_file_path: Box<NativeStr>,
     lock_file: File,
 }
 

crates/fspy_shared/src/ipc/channel/mod.rs

@@ -5,7 +5,7 @@ use std::fmt::Debug;
 
 use bincode::{BorrowDecode, Encode, config::Configuration};
 use bitflags::bitflags;
-pub use native_str::{NativeStr, NativeString};
+pub use native_str::NativeStr;
 
 pub const BINCODE_CONFIG: Configuration = bincode::config::standard();
 
@@ -35,16 +35,16 @@ impl Debug for AccessMode {
 #[derive(Encode, BorrowDecode, Debug, Clone, Copy)]
 pub struct PathAccess<'a> {
     pub mode: AccessMode,
-    pub path: NativeStr<'a>,
+    pub path: &'a NativeStr,
     // TODO: add follow_symlinks (O_NOFOLLOW)
 }
 
 impl<'a> PathAccess<'a> {
-    pub fn read(path: impl Into<NativeStr<'a>>) -> Self {
+    pub fn read(path: impl Into<&'a NativeStr>) -> Self {
         Self { mode: AccessMode::READ, path: path.into() }
     }
 
-    pub fn read_dir(path: impl Into<NativeStr<'a>>) -> Self {
+    pub fn read_dir(path: impl Into<&'a NativeStr>) -> Self {
         Self { mode: AccessMode::READ_DIR, path: path.into() }
     }
 }