Switched from nix to rustix

Cargo.toml

@@ -22,7 +22,6 @@ lazy_static = "1.4"
 rsbinder = { version = "0.2.4", path = "rsbinder", default-features = false }
 log = "0.4"
 env_logger = "0.11"
-nix = "0.28"
 anstyle = "1.0"
 tokio = { version = "1.37", default-features = false }
 async-trait = "0.1"
@@ -35,3 +34,4 @@ tera = "1.19"
 similar = "2.4"
 pretty_hex = { version = "0.4", package = "pretty-hex" }
 downcast-rs = "1.2"
+rustix = "0.38"

rsbinder-aidl/src/parser.rs

@@ -206,10 +206,6 @@ pub fn name_to_const_expr(name: &str) -> Option<ConstExpr> {
     lookup_name_from_decl(&lookup_decl.decl, &lookup_decl)
 }
 
-#[derive(Debug)]
-pub struct Interface {
-}
-
 #[derive(Debug)]
 pub struct Document {
     pub package: Option<String>,

rsbinder-tests/Cargo.toml

@@ -11,7 +11,7 @@ lazy_static = { workspace = true }
 rsbinder = { workspace = true }
 tokio = { workspace = true }
 env_logger = { workspace = true }
-nix = { workspace = true }
+rustix = { workspace = true, features = ["pipe"] }
 async-trait = { workspace = true }
 
 [build-dependencies]

rsbinder-tests/src/test_client.rs

@@ -40,6 +40,7 @@ use android::aidl::versioned::tests::{
 use android::aidl::tests::vintf::{
     VintfExtendableParcelable::VintfExtendableParcelable, VintfParcelable::VintfParcelable,
 };
+use rustix::fd::OwnedFd;
 use std::{fs::File, os::fd::IntoRawFd};
 use std::io::{Read, Write};
 use std::os::unix::io::FromRawFd;
@@ -321,7 +322,7 @@ fn test_interface_list_exchange() {
 }
 
 fn build_pipe() -> (File, File) {
-    let fds = nix::unistd::pipe().expect("error creating pipe");
+    let fds = rustix::pipe::pipe().expect("error creating pipe");
     // Safety: we get two file descriptors from pipe()
     // and pass them after checking if the function returned
     // without an error, so the descriptors should be valid

rsbinder-tools/Cargo.toml

@@ -15,5 +15,4 @@ lazy_static = { workspace = true }
 rsbinder = { workspace = true }
 log = { workspace = true }
 env_logger = { workspace = true }
-nix = { workspace = true }
 anstyle = { workspace = true }

rsbinder/Cargo.toml

@@ -18,7 +18,7 @@ tokio = ["async", "tokio/full"]
 async = ["rsbinder-aidl/async", "async-trait"]
 
 [dependencies]
-nix = { workspace = true, features = ["ioctl", "mount", "fs", "feature", "mman", "process"] }
+rustix = { workspace = true, features = ["process", "param", "mm"] }
 log = { workspace = true }
 pretty_hex = { workspace = true }
 downcast-rs = { workspace = true }

rsbinder/src/binder_object.rs

@@ -3,6 +3,8 @@
 
 use std::mem::ManuallyDrop;
 
+use rustix::fd::{BorrowedFd, FromRawFd, OwnedFd};
+
 pub(crate) use crate::sys::binder::flat_binder_object;
 use crate::{
     binder::*,
@@ -48,6 +50,14 @@ impl flat_binder_object {
         unsafe { self.__bindgen_anon_1.handle }
     }
 
+    pub(crate) fn borrowed_fd(&self) -> BorrowedFd {
+        unsafe { BorrowedFd::borrow_raw(self.handle() as _) }
+    }
+
+    pub(crate) fn owned_fd(&self) -> OwnedFd {
+        unsafe { OwnedFd::from_raw_fd(self.handle() as _) }
+    }
+
     pub(crate) fn set_handle(&mut self, handle: u32) {
         self.__bindgen_anon_1.handle = handle
     }
@@ -101,8 +111,9 @@ impl flat_binder_object {
                 process_state::ProcessState::as_self().strong_proxy_for_handle(self.handle())?.decrease()
             }
             BINDER_TYPE_FD => {
-                if self.cookie != 0 {   // owned
-                    nix::unistd::close(self.handle() as _)?;
+                if self.cookie != 0 {
+                    // Get owned fd and close it.
+                    self.owned_fd();
                 }
 
                 Ok(())

rsbinder/src/binderfs.rs

@@ -3,7 +3,6 @@
 
 use std::path::Path;
 use std::fs::File;
-use std::os::unix::io::{AsRawFd};
 use log;
 use crate::sys::binder;
 use std::ffi::CString;
@@ -27,15 +26,11 @@ pub fn add_device(driver: &Path, name: &str) -> std::io::Result<(u32, u32)> {
         *a = *c as std::os::raw::c_char;
     }
 
-    unsafe {
-        binder::binder_ctl_add(fd.as_raw_fd(), &mut device)
-            .map_err(|e| {
-                log::error!("Binder ioctl to add binder failed: {}", e.to_string());
-                e
-            })?;
-    }
-
-    drop(fd);
+    binder::binder_ctl_add(fd, &mut device)
+        .map_err(|e| {
+            log::error!("Binder ioctl to add binder failed: {}", e.to_string());
+            e
+        })?;
 
     Ok((device.major, device.minor))
 }