Skip to content

gh-160359: Accept older musl getdents64 buffer declarations #160365

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

Merged
itamaro merged 3 commits into from
Oct 23, 2026
Merged

gh-160359: Accept older musl getdents64 buffer declarations #160365

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b4ceca
gh-160359: Accept older musl `getdents64` buffer declarations
zanieb Oct 21, 2026
dfbc0e9
Apply suggestion from @zanieb
zanieb Oct 22, 2026
8ecea48
Apply suggestion from @zanieb
zanieb Oct 22, 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
6 changes: 5 additions & 1 deletion Modules/_posixsubprocess.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,11 @@ _close_open_fds_safe(int start_fd, int *fds_to_keep, Py_ssize_t fds_to_keep_len)
Py_ssize_t bytes;
while (1) {
#ifdef HAVE_GETDENTS64
bytes = getdents64(fd_dir_fd, buffer, sizeof(buffer));
/* musl <1.2.4 headers expose `getdents64` as an alias for `getdents`, whose buffer parameter
* is `struct dirent *`. We use `void *` to support both that interface and the glibc declaration
* without an incompatible-pointer diagnostic.
*/
bytes = getdents64(fd_dir_fd, (void *)buffer, sizeof(buffer));
Comment thread
zanieb marked this conversation as resolved.
#else
bytes = syscall(SYS_getdents64, fd_dir_fd,
(struct py_dirent64 *)buffer, sizeof(buffer));
Expand Down
Loading