Define additional socket ioctls

[leftmostcat]

Define several socket-related ioctls which aren't currently captured. Updated to include ioctls from BSD systems.

libc-test suite has not been run due to #3160.

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

• @rustbot author: the review is finished, PR author should check the comments and take action accordingly
• @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

[JohnTitor]

@bors r+

[bors]

📌 Commit 4a5b962 has been approved by JohnTitor

It is now in the queue for this repository.

[bors]

⌛ Testing commit 4a5b962 with merge 9fc552a...

[bors]

💔 Test failed - checks-actions

[JohnTitor]

Seems the musl header here is old and doesn't know these items, we have to ignore them on the test. See this for example: #3278 (comment)

[bors]

☔ The latest upstream changes (presumably #3278) made this pull request unmergeable. Please resolve the merge conflicts.

[JohnTitor]

Friendly-ping @leftmostcat, could you check the above comment? Thanks!

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout add-sockios (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self add-sockios --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/unix/linux_like/linux/mod.rs
Auto-merging src/unix/linux_like/android/mod.rs
CONFLICT (content): Merge conflict in src/unix/linux_like/android/mod.rs
Auto-merging libc-test/semver/openbsd.txt
Auto-merging libc-test/semver/netbsd.txt
Auto-merging libc-test/semver/linux.txt
Auto-merging libc-test/semver/freebsd.txt
Auto-merging libc-test/semver/dragonfly.txt
Auto-merging libc-test/semver/apple.txt
Auto-merging libc-test/semver/android.txt
Automatic merge failed; fix conflicts and then commit the result.

[JohnTitor]

Triage: Closing as inactive, feel free to re-submit a new PR if you're still interested in this change. Thank you anyway!