mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
fix: align NSH build metadata and descriptor registration
This commit is contained in:
2 files changed
+3
-2
No files matched your search
@@ -85,7 +85,7 @@ jobs:
|
|||||||
--release --bin gpgui-nsh --target-dir target
|
--release --bin gpgui-nsh --target-dir target
|
||||||
target/release/gpgui-nsh --version
|
target/release/gpgui-nsh --version
|
||||||
version="$(cargo +1.97.0 metadata --manifest-path apps/desktop-nsh/Cargo.toml --no-deps --format-version 1 \
|
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"
|
directory="gpgui-nsh_$version"
|
||||||
archive="gpgui-nsh_$(uname -m).bin.tar.xz"
|
archive="gpgui-nsh_$(uname -m).bin.tar.xz"
|
||||||
mkdir -p ".build/package/$directory"
|
mkdir -p ".build/package/$directory"
|
||||||
|
|||||||
@@ -47,7 +47,8 @@ impl DesktopClient {
|
|||||||
fcntl(&fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?;
|
fcntl(&fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?;
|
||||||
let flags = OFlag::from_bits_truncate(fcntl(&fd, FcntlArg::F_GETFL)?);
|
let flags = OFlag::from_bits_truncate(fcntl(&fd, FcntlArg::F_GETFL)?);
|
||||||
fcntl(&fd, FcntlArg::F_SETFL(flags | OFlag::O_NONBLOCK))?;
|
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 {
|
Ok(Self {
|
||||||
input: pipe(input)?,
|
input: pipe(input)?,
|
||||||
|
|||||||
Reference in new issue
Block a user