1 files changed, 27 insertions, 32 deletions

diff --git a/src/bin/rbw-agent/daemon.rs b/src/bin/rbw-agent/daemon.rs
index 923a217..06db891 100644
--- a/src/bin/rbw-agent/daemon.rs
+++ b/src/bin/rbw-agent/daemon.rs
@@ -1,25 +1,15 @@
 pub struct StartupAck {
-    writer: std::os::unix::io::RawFd,
+    writer: std::os::unix::io::OwnedFd,
 }
 
 impl StartupAck {
-    pub fn ack(&self) -> anyhow::Result<()> {
-        nix::unistd::write(self.writer, &[0])?;
-        nix::unistd::close(self.writer)?;
+    pub fn ack(self) -> anyhow::Result<()> {
+        rustix::io::write(&self.writer, &[0])?;
         Ok(())
     }
 }
 
-impl Drop for StartupAck {
-    fn drop(&mut self) {
-        // best effort close here, can't do better in a destructor
-        let _ = nix::unistd::close(self.writer);
-    }
-}
-
 pub fn daemonize() -> anyhow::Result<StartupAck> {
-    rbw::dirs::make_all()?;
-
     let stdout = std::fs::OpenOptions::new()
         .append(true)
         .create(true)
@@ -29,33 +19,38 @@ pub fn daemonize() -> anyhow::Result<StartupAck> {
         .create(true)
         .open(rbw::dirs::agent_stderr_file())?;
 
-    let (r, w) = nix::unistd::pipe()?;
-    let res = daemonize::Daemonize::new()
+    let (r, w) = rustix::pipe::pipe()?;
+    let daemonize = daemonize::Daemonize::new()
         .pid_file(rbw::dirs::pid_file())
         .stdout(stdout)
-        .stderr(stderr)
-        .exit_action(move || {
+        .stderr(stderr);
+    let res = match daemonize.execute() {
+        daemonize::Outcome::Parent(_) => {
+            drop(w);
+            let mut buf = [0; 1];
             // unwraps are necessary because not really a good way to handle
             // errors here otherwise
-            let _ = nix::unistd::close(w);
-            let mut buf = [0; 1];
-            nix::unistd::read(r, &mut buf).unwrap();
-            nix::unistd::close(r).unwrap();
-        })
-        .start();
-    let _ = nix::unistd::close(r);
+            rustix::io::read(&r, &mut buf).unwrap();
+            drop(r);
+            std::process::exit(0);
+        }
+        daemonize::Outcome::Child(res) => res,
+    };
+
+    drop(r);
 
     match res {
         Ok(_) => (),
         Err(e) => {
-            match e {
-                daemonize::DaemonizeError::LockPidfile(_) => {
-                    // this means that there is already an agent running, so
-                    // return a special exit code to allow the cli to detect
-                    // this case and not error out
-                    std::process::exit(23);
-                }
-                _ => panic!("failed to daemonize: {}", e),
+            // XXX super gross, but daemonize removed the ability to match
+            // on specific error types for some reason?
+            if e.to_string().contains("unable to lock pid file") {
+                // this means that there is already an agent running, so
+                // return a special exit code to allow the cli to detect
+                // this case and not error out
+                std::process::exit(23);
+            } else {
+                panic!("failed to daemonize: {e}");
             }
         }
     }