Skip to content

Add more redox sys/socket.h and sys/uio.h definitions #4388

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.

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

Merged
merged 1 commit into from
Apr 10, 2025

Conversation

jackpot51
Copy link
Contributor

Description

This adds the following definitions for Redox OS

Structs:

  • cmsghdr
  • msghdr

Functions:

  • CMSG_ALIGN
  • CMSG_DATA
  • CMSG_FIRSTHDR
  • CMSG_LEN
  • CMSG_NXTHDR
  • CMSG_SPACE
  • recvmsg
  • sendmsg
  • sendto
  • preadv
  • pwritev

Sources

Checklist

  • Relevant tests in libc-test/semver have been updated
  • No placeholder or unstable values like *LAST or *MAX are
    included (see #3131)
  • Tested locally (cd libc-test && cargo test --target mytarget);
    especially relevant for platforms that may not be checked in CI

@rustbot
Copy link
Collaborator

rustbot commented Apr 10, 2025

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

pub msg_iov: *mut crate::iovec,
pub msg_iovlen: size_t,
pub msg_control: *mut c_void,
pub msg_controllen: size_t,
Copy link
Contributor

Choose a reason for hiding this comment

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

From the linked source, should this also be socklen_t?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

}

pub struct cmsghdr {
pub cmsg_len: size_t,
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

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

Thanks for the updates, the rest LGTM.

@rustbot label +stable-nominated

@rustbot rustbot added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Apr 10, 2025
@tgross35 tgross35 enabled auto-merge April 10, 2025 21:19
@jackpot51
Copy link
Contributor Author

The android test failed, I don't think it is because of my changes.

@tgross35
Copy link
Contributor

The android tests have been very flaky, I don't know why. Restarted.

@tgross35 tgross35 added this pull request to the merge queue Apr 10, 2025
Merged via the queue into rust-lang:main with commit 564b72b Apr 10, 2025
47 checks passed
@jackpot51
Copy link
Contributor Author

Will this change go to the 0.2 branch as well?

@tgross35
Copy link
Contributor

It will, I cherry pick everything labeled stable-nominated whenever I do a release.

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025
@tgross35 tgross35 mentioned this pull request Apr 11, 2025
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Apr 15, 2025
@jackpot51 jackpot51 deleted the redox-socket branch May 2, 2025 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-redox O-unix S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants