From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Feb 2024 17:18:21 +0000 (+0000)
Subject: nix: Make a compat function for last errno as Errno
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4bd0fe187103746b47abf0028234159d6e6230b5;p=hippotat.git

nix: Make a compat function for last errno as Errno

This fixes a warning.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/server/daemon.rs b/server/daemon.rs
index 48b664a..944d8dc 100644
--- a/server/daemon.rs
+++ b/server/daemon.rs
@@ -120,7 +120,7 @@ unsafe fn intermediate(child: Pid, st_wfd: RawFd) -> ! {
 
   let r = libc::waitpid(child.as_raw(), &mut wstatus, 0);
   if r == -1 { crashe("await child startup status",
-                      nix::errno::from_i32(errno())) }
+                      compat::nix_last_errno()) }
   if r != child.as_raw() { crashm("await child startup status: wrong pid") }
 
   let cooked = WaitStatus::from_raw(child, wstatus)
diff --git a/src/compat.rs b/src/compat.rs
index 220ab11..dff38bf 100644
--- a/src/compat.rs
+++ b/src/compat.rs
@@ -53,3 +53,9 @@ pub fn pipe() -> nix::Result<(c_int, c_int)> {
   }};
   Ok((map(a), map(b)))
 }
+
+#[allow(deprecated)]
+pub fn nix_last_errno() -> nix::errno::Errno {
+  use nix::errno::*;
+  from_i32(errno())
+}