Skip to content

Fixing the improper type of sighandler_t on unix #4918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ItshMoh wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fixing the improper type of sighandler_t on unix #4918

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
585e3df
pushed the proper type of sighandler_t using anonymous union on unix.
ItshMoh Jan 7, 2026
611b672
fixed the argument state name.
ItshMoh Jan 7, 2026
f63e902
fixed the missing crate issue.
ItshMoh Jan 7, 2026
92b120e
fixed the :: issue
ItshMoh Jan 7, 2026
cf39bce
Removed the Debug implementation from the __c_anonymous_sigaction_han…
ItshMoh Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub type ssize_t = isize;
pub type pid_t = i32;
pub type in_addr_t = u32;
pub type in_port_t = u16;
pub type sighandler_t = size_t;
pub type sighandler_t = __c_anonymous_sigaction_handler;
pub type cc_t = c_uchar;

cfg_if! {
Expand All @@ -44,6 +44,18 @@ extern_ty! {
#[cfg(not(target_os = "nuttx"))]
pub type locale_t = *mut c_void;

s_no_extra_traits! {
pub union __c_anonymous_sigaction_handler{
Copy link
Contributor

@tgross35 tgross35 Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't need to be a __c_anonymous type, it can just be union sighandler_t with no alias since we're exporting it this way anyway.

Copy link
Contributor

@tgross35 tgross35 Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add a comment about what the variants are representing? The two function pointers come from source, the integer variant is needed since sentinel values that aren't function pointers are used.

(maybe there's a better name for default? I think raw may make more sense)

pub sa_handler: Option<extern "C" fn(c_int) -> ()>,
pub sa_sigaction: Option<extern "C" fn(
Comment on lines +49 to +50
Copy link
Contributor

@tgross35 tgross35 Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you make these functions unsafe?

c_int,
*mut siginfo_t,
*mut c_void
) -> ()>,
pub default: size_t,
}
}

s! {
pub struct group {
pub gr_name: *mut c_char,
Expand Down Expand Up @@ -244,12 +256,28 @@ cfg_if! {
}
}

cfg_if! {
if #[cfg(feature = "extra_traits")] {
impl PartialEq for __c_anonymous_sigaction_handler {
fn eq(&self, other: &__c_anonymous_sigaction_handler) -> bool {
unsafe{ self.default == other.default }
}
}
impl Eq for __c_anonymous_sigaction_handler{}
impl hash::Hash for __c_anonymous_sigaction_handler {
fn hash<H: hash::Hasher>(&self, state: &mut H) {
unsafe{ self.default.hash(state) };
}
}
}
}
Copy link
Contributor

@tgross35 tgross35 Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please delete these, we are avoiding adding more iffy trait impls (even though this one is reasonably sound)


pub const INT_MIN: c_int = -2147483648;
pub const INT_MAX: c_int = 2147483647;

pub const SIG_DFL: sighandler_t = 0 as sighandler_t;
pub const SIG_IGN: sighandler_t = 1 as sighandler_t;
pub const SIG_ERR: sighandler_t = !0 as sighandler_t;
pub const SIG_DFL: sighandler_t = sighandler_t { default: 0 };
pub const SIG_IGN: sighandler_t = sighandler_t { default: 1 };
pub const SIG_ERR: sighandler_t = sighandler_t { default: !0 };

cfg_if! {
if #[cfg(all(not(target_os = "nto"), not(target_os = "aix")))] {
Expand Down
Loading