Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
b394c1da
Commit
b394c1da
authored
Mar 03, 2013
by
Gregory P. Smith
Browse files
Options
Browse Files
Download
Plain Diff
Fixes Issue #16962: Use getdents64 instead of the obsolete getdents syscall
in the subprocess module on Linux.
parents
04a29554
255bf5b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
14 deletions
+11
-14
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_posixsubprocess.c
Modules/_posixsubprocess.c
+8
-14
No files found.
Misc/NEWS
View file @
b394c1da
...
...
@@ -273,6 +273,9 @@ Core and Builtins
Library
-------
-
Issue
#
16962
:
Use
getdents64
instead
of
the
obsolete
getdents
syscall
in
the
subprocess
module
on
Linux
.
-
Issue
#
16935
:
unittest
now
counts
the
module
as
skipped
if
it
raises
SkipTest
,
instead
of
counting
it
as
an
error
.
Patch
by
Zachary
Ware
.
...
...
Modules/_posixsubprocess.c
View file @
b394c1da
...
...
@@ -176,17 +176,11 @@ _close_fds_by_brute_force(int start_fd, int end_fd, PyObject *py_fds_to_keep)
* This structure is very old and stable: It will not change unless the kernel
* chooses to break compatibility with all existing binaries. Highly Unlikely.
*/
struct
linux_dirent
{
#if defined(__x86_64__) && defined(__ILP32__)
/* Support the wacky x32 ABI (fake 32-bit userspace speaking to x86_64
* kernel interfaces) - https://sites.google.com/site/x32abi/ */
struct
linux_dirent64
{
unsigned
long
long
d_ino
;
unsigned
long
long
d_off
;
#else
unsigned
long
d_ino
;
/* Inode number */
unsigned
long
d_off
;
/* Offset to next linux_dirent */
#endif
long
long
d_off
;
unsigned
short
d_reclen
;
/* Length of this linux_dirent */
unsigned
char
d_type
;
char
d_name
[
256
];
/* Filename (null-terminated) */
};
...
...
@@ -228,16 +222,16 @@ _close_open_fd_range_safe(int start_fd, int end_fd, PyObject* py_fds_to_keep)
_close_fds_by_brute_force
(
start_fd
,
end_fd
,
py_fds_to_keep
);
return
;
}
else
{
char
buffer
[
sizeof
(
struct
linux_dirent
)];
char
buffer
[
sizeof
(
struct
linux_dirent
64
)];
int
bytes
;
while
((
bytes
=
syscall
(
SYS_getdents
,
fd_dir_fd
,
(
struct
linux_dirent
*
)
buffer
,
while
((
bytes
=
syscall
(
SYS_getdents
64
,
fd_dir_fd
,
(
struct
linux_dirent
64
*
)
buffer
,
sizeof
(
buffer
)))
>
0
)
{
struct
linux_dirent
*
entry
;
struct
linux_dirent
64
*
entry
;
int
offset
;
for
(
offset
=
0
;
offset
<
bytes
;
offset
+=
entry
->
d_reclen
)
{
int
fd
;
entry
=
(
struct
linux_dirent
*
)(
buffer
+
offset
);
entry
=
(
struct
linux_dirent
64
*
)(
buffer
+
offset
);
if
((
fd
=
_pos_int_from_ascii
(
entry
->
d_name
))
<
0
)
continue
;
/* Not a number. */
if
(
fd
!=
fd_dir_fd
&&
fd
>=
start_fd
&&
fd
<
end_fd
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment