vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: clean up session artifacts — stray dir, libwayland source revert

Browse Source 
- Remove stray nested local/recipes/wayland/libwayland/libwayland/
- Revert wayland-client.c source edit (patch-based now)
- Commit P0-daemon-fix-init-notify-unwrap.patch modifications
This commit is contained in:
Vasilito
2026-05-06 15:36:43 +01:00
parent e3e5cd9e00
commit 61dbb9373a
1 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/base/P0-daemon-fix-init-notify-unwrap.patch
+69 -10
View File
@@ -1,12 +1,14 @@
diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs
index 9f507221..c57d91dc 100644 index 9f507221..c69c2cfa 100644
--- a/daemon/src/lib.rs --- a/daemon/src/lib.rs
+++ b/daemon/src/lib.rs +++ b/daemon/src/lib.rs
@@ -11,12 +11,23 @@ use redox_scheme::Socket; @@ -10,15 +10,26 @@ use libredox::Fd;
use redox_scheme::Socket;
use redox_scheme::scheme::{SchemeAsync, SchemeSync}; use redox_scheme::scheme::{SchemeAsync, SchemeSync};
unsafe fn get_fd(var: &str) -> RawFd { -unsafe fn get_fd(var: &str) -> RawFd {
- let fd: RawFd = std::env::var(var).unwrap().parse().unwrap(); - let fd: RawFd = std::env::var(var).unwrap().parse().unwrap();
+unsafe fn get_fd(var: &str) -> Option<RawFd> {
+ let fd: RawFd = match std::env::var(var) + let fd: RawFd = match std::env::var(var)
+ .map_err(|e| eprintln!("daemon: env var {var} not set: {e}")) + .map_err(|e| eprintln!("daemon: env var {var} not set: {e}"))
+ .ok() + .ok()
@@ -16,7 +18,7 @@ index 9f507221..c57d91dc 100644
+ .ok() + .ok()
+ }) { + }) {
+ Some(fd) => fd, + Some(fd) => fd,
+ None => return -1, + None => return None,
+ }; + };
if unsafe { libc::fcntl(fd, libc::F_SETFD, libc::FD_CLOEXEC) } == -1 { if unsafe { libc::fcntl(fd, libc::F_SETFD, libc::FD_CLOEXEC) } == -1 {
- panic!( - panic!(
@@ -24,20 +26,77 @@ index 9f507221..c57d91dc 100644
"daemon: failed to set CLOEXEC flag for {var} fd: {}", "daemon: failed to set CLOEXEC flag for {var} fd: {}",
io::Error::last_os_error() io::Error::last_os_error()
); );
+ return -1; + return None;
} }
fd - fd
+ Some(fd)
} }
@@ -51,7 +62,11 @@ impl Daemon {
unsafe fn pass_fd(cmd: &mut Command, env: &str, fd: OwnedFd) {
@@ -38,20 +49,26 @@ unsafe fn pass_fd(cmd: &mut Command, env: &str, fd: OwnedFd) {
/// A long running background process that handles requests.
#[must_use = "Daemon::ready must be called"]
pub struct Daemon {
- write_pipe: PipeWriter,
+ write_pipe: Option<PipeWriter>,
}
impl Daemon {
/// Create a new daemon.
pub fn new(f: impl FnOnce(Daemon) -> !) -> ! {
- let write_pipe = unsafe { io::PipeWriter::from_raw_fd(get_fd("INIT_NOTIFY")) };
+ let write_pipe = unsafe { get_fd("INIT_NOTIFY").map(|fd| io::PipeWriter::from_raw_fd(fd)) };
f(Daemon { write_pipe })
}
/// Notify the process that the daemon is ready to accept requests. /// Notify the process that the daemon is ready to accept requests.
pub fn ready(mut self) { pub fn ready(mut self) {
- self.write_pipe.write_all(&[0]).unwrap(); - self.write_pipe.write_all(&[0]).unwrap();
+ if let Err(err) = self.write_pipe.write_all(&[0]) { + if let Some(write_pipe) = self.write_pipe.as_mut() {
+ if err.kind() != io::ErrorKind::BrokenPipe { + if let Err(err) = write_pipe.write_all(&[0]) {
+ eprintln!("daemon::ready write failed: {err}"); + if err.kind() != io::ErrorKind::BrokenPipe {
+ eprintln!("daemon::ready write failed: {err}");
+ }
+ } + }
+ } + }
} }
/// Executes `Command` as a child process. /// Executes `Command` as a child process.
@@ -83,25 +100,28 @@ impl Daemon {
/// A long running background process that handles requests using schemes.
#[must_use = "SchemeDaemon::ready must be called"]
pub struct SchemeDaemon {
- write_pipe: PipeWriter,
+ write_pipe: Option<PipeWriter>,
}
impl SchemeDaemon {
/// Create a new daemon for use with schemes.
pub fn new(f: impl FnOnce(SchemeDaemon) -> !) -> ! {
- let write_pipe = unsafe { io::PipeWriter::from_raw_fd(get_fd("INIT_NOTIFY")) };
+ let write_pipe = unsafe { get_fd("INIT_NOTIFY").map(|fd| io::PipeWriter::from_raw_fd(fd)) };
f(SchemeDaemon { write_pipe })
}
/// Notify the process that the scheme daemon is ready to accept requests.
pub fn ready_with_fd(self, cap_fd: Fd) -> syscall::Result<()> {
- syscall::call_wo(
- self.write_pipe.as_raw_fd() as usize,
- &cap_fd.into_raw().to_ne_bytes(),
- syscall::CallFlags::FD,
- &[],
- )?;
+ let cap_raw = cap_fd.into_raw();
+ if let Some(write_pipe) = self.write_pipe {
+ syscall::call_wo(
+ write_pipe.as_raw_fd() as usize,
+ &cap_raw.to_ne_bytes(),
+ syscall::CallFlags::FD,
+ &[],
+ )?;
+ }
Ok(())
}