Replace libc with rustix in stak-file (#2015)

raviqqe · Jan 18, 2025 · 6895042 · 6895042
1 parent d0a5561
commit 6895042
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmd/minimal/Cargo.lock b/cmd/minimal/Cargo.lock
diff --git a/cspell.json b/cspell.json
@@ -29,6 +29,7 @@
     "coreutils",
     "doctest",
     "embeddable",
+    "errno",
     "exif",
     "expt",
     "fclose",
@@ -69,6 +70,7 @@
     "rposition",
     "rustc",
     "rustfmt",
+    "rustix",
     "rustup",
     "stak",
     "uninlined",

diff --git a/file/Cargo.toml b/file/Cargo.toml
@@ -9,12 +9,14 @@ readme.workspace = true
 repository.workspace = true
 
 [features]
-libc = ["dep:libc"]
+libc = ["dep:rustix"]
 std = []
 
 [dependencies]
-heapless = "0.8.0"
-libc = { version = "0.2", default-features = false, optional = true }
+heapless = { version = "0.8.0", default-features = false }
+rustix = { version = "0.38.43", default-features = false, features = [
+  "fs",
+], optional = true }
 stak-vm = { version = "0.7.21", path = "../vm" }
 
 [dev-dependencies]

diff --git a/file/src/file_system/error.rs b/file/src/file_system/error.rs
@@ -10,6 +10,8 @@ pub enum FileError {
     Open,
     /// A close failure.
     Close,
+    /// An invalid file descriptor.
+    InvalidFileDescriptor,
     /// A read failure.
     Read,
     /// A write failure.
@@ -29,6 +31,7 @@ impl Display for FileError {
         match self {
             Self::Open => write!(formatter, "cannot open file"),
             Self::Close => write!(formatter, "cannot close file"),
+            Self::InvalidFileDescriptor => write!(formatter, "invalid file descriptor"),
             Self::Read => write!(formatter, "cannot read file"),
             Self::Write => write!(formatter, "cannot write file"),
             Self::Delete => write!(formatter, "cannot delete file"),