fix: daemon scheme_root/create_this_scheme_fd error conversion

Fix 4 E0277 errors in daemon/src/lib.rs where scheme_root()
and create_this_scheme_fd() return syscall::error::Error but
the function returns syscall::Error. Add .map_err() conversions.

redox-driver-sys errors (6 remaining E0308/E0061 in dma.rs/io.rs)
are pre-existing API mismatches between libredox and redox_syscall
crate versions — not addressed here.
This commit is contained in:
2026-05-30 08:00:29 +03:00
parent 37738dc418
commit ad85d9bf0c
2 changed files with 6 additions and 4 deletions
@@ -135,8 +135,8 @@ impl SchemeDaemon {
socket: &Socket,
scheme: &mut S,
) -> syscall::Result<()> {
let cap_id = scheme.scheme_root()?;
let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0)?;
let cap_id = scheme.scheme_root().map_err(|e| syscall::Error::new(e.errno))?;
let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0).map_err(|e| syscall::Error::new(e.errno))?;
self.ready_with_fd(Fd::new(cap_fd))
}
@@ -146,8 +146,8 @@ impl SchemeDaemon {
socket: &Socket,
scheme: &mut S,
) -> syscall::Result<()> {
let cap_id = scheme.scheme_root()?;
let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0)?;
let cap_id = scheme.scheme_root().map_err(|e| syscall::Error::new(e.errno))?;
let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0).map_err(|e| syscall::Error::new(e.errno))?;
self.ready_with_fd(Fd::new(cap_fd))
}
}
+2
View File
@@ -40,6 +40,8 @@ if [ "$TARGET" != "$COOKBOOK_HOST_TARGET" ]; then
)
else
COOKBOOK_CONFIGURE_FLAGS=(--prefix=/usr)
# redoxer host sysroot may not define LONG_BIT via <limits.h>
export CFLAGS="${CFLAGS:-} -DLONG_BIT=64"
fi
if [ "${COOKBOOK_DYNAMIC}" != "1" ]; then