h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 11:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary use of errno

Browse Source
This commit is contained in:
Fabian Boehm
2025-01-01 21:45:07 +01:00
parent 996fec87f4
commit edfdf210c4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fds.rs
View File

@@ -5,7 +5,6 @@
use crate::tests::prelude::*; use crate::tests::prelude::*;
use crate::wchar::prelude::*; use crate::wchar::prelude::*;
use crate::wutil::perror; use crate::wutil::perror;
use errno::{errno, set_errno};
use libc::{c_int, EINTR, FD_CLOEXEC, F_GETFD, F_GETFL, F_SETFD, F_SETFL, O_NONBLOCK}; use libc::{c_int, EINTR, FD_CLOEXEC, F_GETFD, F_GETFL, F_SETFD, F_SETFL, O_NONBLOCK};
use nix::fcntl::FcntlArg; use nix::fcntl::FcntlArg;
use nix::{fcntl::OFlag, unistd}; use nix::{fcntl::OFlag, unistd};
@@ -234,8 +233,6 @@ pub fn wopen_cloexec(
pub fn open_cloexec(path: &CStr, flags: OFlag, mode: nix::sys::stat::Mode) -> nix::Result<File> { pub fn open_cloexec(path: &CStr, flags: OFlag, mode: nix::sys::stat::Mode) -> nix::Result<File> {
// Port note: the C++ version of this function had a fallback for platforms where // Port note: the C++ version of this function had a fallback for platforms where
// O_CLOEXEC is not supported, using fcntl. In 2023, this is no longer needed. // O_CLOEXEC is not supported, using fcntl. In 2023, this is no longer needed.
let saved_errno = errno();
errno::set_errno(errno::Errno(0));
// We retry this in case of signals, // We retry this in case of signals,
// if we get EINTR and it's not a SIGINT, we continue. // if we get EINTR and it's not a SIGINT, we continue.
// If it is that's our cancel signal, so we abort. // If it is that's our cancel signal, so we abort.
@@ -244,7 +241,6 @@ pub fn open_cloexec(path: &CStr, flags: OFlag, mode: nix::sys::stat::Mode) -> ni
let ret = ret.map(|raw_fd| unsafe { File::from_raw_fd(raw_fd) }); let ret = ret.map(|raw_fd| unsafe { File::from_raw_fd(raw_fd) });
match ret { match ret {
Ok(file) => { Ok(file) => {
set_errno(saved_errno);
return Ok(file); return Ok(file);
} }
Err(err) => { Err(err) => {