Skip to content

gh-81793: Always call linkat() from os.link(), if available #132517

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
serhiy-storchaka merged 13 commits into from
May 4, 2025
Merged

gh-81793: Always call linkat() from os.link(), if available #132517

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a8f488a
gh-81793: Always call linkat() from os.link(), if available
serhiy-storchaka Apr 14, 2025
4ba224e
Fix typo and regenerate clinic files.
serhiy-storchaka Apr 14, 2025
5881b2a
Fix OpenIndiana.
serhiy-storchaka Apr 14, 2025
d2f233b
Fix test_inspect.
serhiy-storchaka Apr 14, 2025
95f55e3
Enable linkat().
serhiy-storchaka Apr 14, 2025
2eeb438
Apply suggestions from code review
serhiy-storchaka Apr 14, 2025
b4be526
Use subTest().
serhiy-storchaka Apr 15, 2025
80128e3
Disable linkat() on WASI.
serhiy-storchaka Apr 15, 2025
a45dfd9
Test how link() actually works on WASI.
serhiy-storchaka Apr 15, 2025
557f1ee
Revert "Test how link() actually works on WASI."
serhiy-storchaka Apr 15, 2025
b156f94
Merge branch 'main' into os-link-follow_symlinks
serhiy-storchaka Apr 21, 2025
2c436fb
Remove redundant checks for same type.
serhiy-storchaka Apr 21, 2025
0c7b16d
Merge branch 'main' into os-link-follow_symlinks
serhiy-storchaka May 4, 2025
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
Prev Previous commit
Next Next commit
Remove redundant checks for same type.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Apr 21, 2025
commit 2c436fbe85f398efb3921ab2a8c6d9a44f722148
20 changes: 0 additions & 20 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4386,14 +4386,6 @@ os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
#endif
}

#ifdef MS_WINDOWS
if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) {
PyErr_SetString(PyExc_NotImplementedError,
"link: src and dst must be the same type");
return NULL;
}
#endif

if (PySys_Audit("os.link", "OOii", src->object, dst->object,
src_dir_fd == DEFAULT_DIR_FD ? -1 : src_dir_fd,
dst_dir_fd == DEFAULT_DIR_FD ? -1 : dst_dir_fd) < 0) {
Expand Down Expand Up @@ -5913,12 +5905,6 @@ internal_rename(path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int is
return path_error2(src, dst);

#else
if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) {
PyErr_Format(PyExc_ValueError,
"%s: src and dst must be the same type", function_name);
return NULL;
}

Py_BEGIN_ALLOW_THREADS
#ifdef HAVE_RENAMEAT
if (dir_fd_specified) {
Expand Down Expand Up @@ -10591,12 +10577,6 @@ os_symlink_impl(PyObject *module, path_t *src, path_t *dst,

#else

if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) {
PyErr_SetString(PyExc_ValueError,
"symlink: src and dst must be the same type");
return NULL;
}

Py_BEGIN_ALLOW_THREADS
#ifdef HAVE_SYMLINKAT
if (dir_fd != DEFAULT_DIR_FD) {
Expand Down
Loading