From 6ebffad3c8fd513dd1db5aeee479104269719543 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 2 Nov 2026 15:33:22 +0800 Subject: [PATCH] fix: align NSH build metadata and descriptor registration --- .github/workflows/build-gpgui-nsh-linux.yaml | 2 +- apps/gpservice/src/desktop_client.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-gpgui-nsh-linux.yaml b/.github/workflows/build-gpgui-nsh-linux.yaml index b2971de..e98eb68 100644 --- a/.github/workflows/build-gpgui-nsh-linux.yaml +++ b/.github/workflows/build-gpgui-nsh-linux.yaml @@ -85,7 +85,7 @@ jobs: --release --bin gpgui-nsh --target-dir target target/release/gpgui-nsh --version version="$(cargo +1.97.0 metadata --manifest-path apps/desktop-nsh/Cargo.toml --no-deps --format-version 1 \ - | jq -r '.packages[] | select(.name == "gp-connect-nsh") | .version')" + | jq -r '.packages[] | select(.name == "gpgui-nsh") | .version')" directory="gpgui-nsh_$version" archive="gpgui-nsh_$(uname -m).bin.tar.xz" mkdir -p ".build/package/$directory" diff --git a/apps/gpservice/src/desktop_client.rs b/apps/gpservice/src/desktop_client.rs index 40c571e..47b357c 100644 --- a/apps/gpservice/src/desktop_client.rs +++ b/apps/gpservice/src/desktop_client.rs @@ -47,7 +47,8 @@ impl DesktopClient { fcntl(&fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?; let flags = OFlag::from_bits_truncate(fcntl(&fd, FcntlArg::F_GETFL)?); fcntl(&fd, FcntlArg::F_SETFL(flags | OFlag::O_NONBLOCK))?; - Ok(AsyncFd::new(fd)?) + // SAFETY: OwnedFd keeps this descriptor open and unchanged until AsyncFd drops it. + Ok(unsafe { AsyncFd::register(fd) }?) } Ok(Self { input: pipe(input)?,