switch from nix to rustix

3 files changed, 33 insertions, 21 deletions

diff --git a/src/bin/rbw-agent/daemon.rs b/src/bin/rbw-agent/daemon.rs
index 640d5e2..06db891 100644
--- a/src/bin/rbw-agent/daemon.rs
+++ b/src/bin/rbw-agent/daemon.rs
@@ -1,12 +1,10 @@
-use std::os::fd::AsRawFd as _;
-
 pub struct StartupAck {
     writer: std::os::unix::io::OwnedFd,
 }
 
 impl StartupAck {
     pub fn ack(self) -> anyhow::Result<()> {
-        nix::unistd::write(&self.writer, &[0])?;
+        rustix::io::write(&self.writer, &[0])?;
         Ok(())
     }
 }
@@ -21,7 +19,7 @@ pub fn daemonize() -> anyhow::Result<StartupAck> {
         .create(true)
         .open(rbw::dirs::agent_stderr_file())?;
 
-    let (r, w) = nix::unistd::pipe()?;
+    let (r, w) = rustix::pipe::pipe()?;
     let daemonize = daemonize::Daemonize::new()
         .pid_file(rbw::dirs::pid_file())
         .stdout(stdout)
@@ -32,7 +30,7 @@ pub fn daemonize() -> anyhow::Result<StartupAck> {
             let mut buf = [0; 1];
             // unwraps are necessary because not really a good way to handle
             // errors here otherwise
-            nix::unistd::read(r.as_raw_fd(), &mut buf).unwrap();
+            rustix::io::read(&r, &mut buf).unwrap();
             drop(r);
             std::process::exit(0);
         }
diff --git a/src/bin/rbw-agent/debugger.rs b/src/bin/rbw-agent/debugger.rs
index 59bbe50..be5260c 100644
--- a/src/bin/rbw-agent/debugger.rs
+++ b/src/bin/rbw-agent/debugger.rs
@@ -12,7 +12,7 @@ pub fn disable_tracing() -> anyhow::Result<()> {
     if ret == 0 {
         Ok(())
     } else {
-        let e = nix::Error::last();
+        let e = std::io::Error::last_os_error();
         Err(anyhow::anyhow!("failed to disable PTRACE_ATTACH, agent memory may be dumpable by other processes: {}", e))
     }
 }
diff --git a/src/bin/rbw/actions.rs b/src/bin/rbw/actions.rs
index a13c58b..c84ccd4 100644
--- a/src/bin/rbw/actions.rs
+++ b/src/bin/rbw/actions.rs
@@ -1,4 +1,4 @@
-use anyhow::Context as _;
+use anyhow::{bail, Context as _};
 use std::io::Read as _;
 
 pub fn register() -> anyhow::Result<()> {
@@ -31,11 +31,17 @@ pub fn quit() -> anyhow::Result<()> {
             let pidfile = rbw::dirs::pid_file();
             let mut pid = String::new();
             std::fs::File::open(pidfile)?.read_to_string(&mut pid)?;
-            let pid = nix::unistd::Pid::from_raw(pid.trim_end().parse()?);
+            let Some(pid) =
+                rustix::process::Pid::from_raw(pid.trim_end().parse()?)
+            else {
+                bail!("failed to read pid from pidfile");
+            };
             sock.send(&rbw::protocol::Request {
-                tty: nix::unistd::ttyname(std::io::stdin()).ok().and_then(
-                    |p| p.to_str().map(std::string::ToString::to_string),
-                ),
+                tty: rustix::termios::ttyname(std::io::stdin(), vec![])
+                    .ok()
+                    .and_then(|p| {
+                        p.to_str().map(std::string::ToString::to_string).ok()
+                    }),
                 action: rbw::protocol::Action::Quit,
             })?;
             wait_for_exit(pid);
@@ -57,9 +63,11 @@ pub fn decrypt(
 ) -> anyhow::Result<String> {
     let mut sock = connect()?;
     sock.send(&rbw::protocol::Request {
-        tty: nix::unistd::ttyname(std::io::stdin())
+        tty: rustix::termios::ttyname(std::io::stdin(), vec![])
             .ok()
-            .and_then(|p| p.to_str().map(std::string::ToString::to_string)),
+            .and_then(|p| {
+                p.to_str().map(std::string::ToString::to_string).ok()
+            }),
         action: rbw::protocol::Action::Decrypt {
             cipherstring: cipherstring.to_string(),
             org_id: org_id.map(std::string::ToString::to_string),
@@ -82,9 +90,11 @@ pub fn encrypt(
 ) -> anyhow::Result<String> {
     let mut sock = connect()?;
     sock.send(&rbw::protocol::Request {
-        tty: nix::unistd::ttyname(std::io::stdin())
+        tty: rustix::termios::ttyname(std::io::stdin(), vec![])
             .ok()
-            .and_then(|p| p.to_str().map(std::string::ToString::to_string)),
+            .and_then(|p| {
+                p.to_str().map(std::string::ToString::to_string).ok()
+            }),
         action: rbw::protocol::Action::Encrypt {
             plaintext: plaintext.to_string(),
             org_id: org_id.map(std::string::ToString::to_string),
@@ -110,9 +120,11 @@ pub fn clipboard_store(text: &str) -> anyhow::Result<()> {
 pub fn version() -> anyhow::Result<u32> {
     let mut sock = connect()?;
     sock.send(&rbw::protocol::Request {
-        tty: nix::unistd::ttyname(std::io::stdin())
+        tty: rustix::termios::ttyname(std::io::stdin(), vec![])
             .ok()
-            .and_then(|p| p.to_str().map(std::string::ToString::to_string)),
+            .and_then(|p| {
+                p.to_str().map(std::string::ToString::to_string).ok()
+            }),
         action: rbw::protocol::Action::Version,
     })?;
 
@@ -130,9 +142,11 @@ fn simple_action(action: rbw::protocol::Action) -> anyhow::Result<()> {
     let mut sock = connect()?;
 
     sock.send(&rbw::protocol::Request {
-        tty: nix::unistd::ttyname(std::io::stdin())
+        tty: rustix::termios::ttyname(std::io::stdin(), vec![])
             .ok()
-            .and_then(|p| p.to_str().map(std::string::ToString::to_string)),
+            .and_then(|p| {
+                p.to_str().map(std::string::ToString::to_string).ok()
+            }),
         action,
     })?;
 
@@ -158,9 +172,9 @@ fn connect() -> anyhow::Result<crate::sock::Sock> {
     })
 }
 
-fn wait_for_exit(pid: nix::unistd::Pid) {
+fn wait_for_exit(pid: rustix::process::Pid) {
     loop {
-        if nix::sys::signal::kill(pid, None).is_err() {
+        if rustix::process::test_kill_process(pid).is_err() {
             break;
         }
         std::thread::sleep(std::time::Duration::from_millis(10));