Skip to content

Update os.py from 3.13.5 #6076

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
youknowone merged 4 commits into from
Aug 8, 2025
Merged

Update os.py from 3.13.5 #6076

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ce8161
Update `os.py` from 3.13.5
ShaharNaveh Aug 5, 2025
b028438
Set availablity of some `os` functions
ShaharNaveh Aug 7, 2025
76421b6
revert some cfg
ShaharNaveh Aug 7, 2025
d95ec8b
Mark more failing tests
ShaharNaveh Aug 7, 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
revert some cfg
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Aug 7, 2025
commit 76421b629d2d9611f217af8a4d5915daba83a948
43 changes: 20 additions & 23 deletions vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,16 +1123,13 @@ pub mod module {
vm.ctx.new_int(euid).into()
}

#[cfg(all(unix, not(any(target_os = "wasi", target_os = "android"))))]
#[cfg(not(any(target_os = "wasi", target_os = "android")))]
#[pyfunction]
fn setgid(gid: Gid, vm: &VirtualMachine) -> PyResult<()> {
unistd::setgid(gid).map_err(|err| err.into_pyexception(vm))
}

#[cfg(all(
unix,
not(any(target_os = "wasi", target_os = "android", target_os = "redox"))
))]
#[cfg(not(any(target_os = "wasi", target_os = "android", target_os = "redox")))]
#[pyfunction]
fn setegid(egid: Gid, vm: &VirtualMachine) -> PyResult<()> {
unistd::setegid(egid).map_err(|err| err.into_pyexception(vm))
Expand All @@ -1144,7 +1141,7 @@ pub mod module {
.map_err(|err| err.into_pyexception(vm))
}

#[cfg(all(unix, not(any(target_os = "wasi", target_os = "redox"))))]
#[cfg(not(any(target_os = "wasi", target_os = "redox")))]
#[pyfunction]
fn setsid(vm: &VirtualMachine) -> PyResult<()> {
unistd::setsid()
Expand Down Expand Up @@ -1190,34 +1187,31 @@ pub mod module {
}
}

#[cfg(all(unix, not(any(target_os = "wasi", target_os = "android"))))]
#[cfg(not(any(target_os = "wasi", target_os = "android")))]
#[pyfunction]
fn setuid(uid: Uid) -> nix::Result<()> {
unistd::setuid(uid)
}

#[cfg(all(
unix,
not(any(target_os = "wasi", target_os = "android", target_os = "redox"))
))]
#[cfg(not(any(target_os = "wasi", target_os = "android", target_os = "redox")))]
#[pyfunction]
fn seteuid(euid: Uid) -> nix::Result<()> {
unistd::seteuid(euid)
}

#[cfg(all(
unix,
not(any(target_os = "wasi", target_os = "android", target_os = "redox"))
))]
#[cfg(not(any(target_os = "wasi", target_os = "android", target_os = "redox")))]
#[pyfunction]
fn setreuid(ruid: Uid, euid: Uid) -> nix::Result<()> {
let ret = unsafe { libc::setreuid(ruid.as_raw(), euid.as_raw()) };
nix::Error::result(ret).map(drop)
}

#[cfg(all(
unix,
not(any(target_os = "wasi", target_os = "android", target_os = "redox"))
// cfg from nix
#[cfg(any(
target_os = "android",
target_os = "freebsd",
target_os = "linux",
target_os = "openbsd"
))]
#[pyfunction]
fn setresuid(ruid: Uid, euid: Uid, suid: Uid) -> nix::Result<()> {
Expand Down Expand Up @@ -1303,17 +1297,20 @@ pub mod module {
unistd::setresgid(rgid, egid, sgid).map_err(|err| err.into_pyexception(vm))
}

#[cfg(all(
unix,
not(any(target_os = "wasi", target_os = "android", target_os = "redox"))
))]
#[cfg(not(any(target_os = "wasi", target_os = "android", target_os = "redox")))]
#[pyfunction]
fn setregid(rgid: Gid, egid: Gid) -> nix::Result<()> {
let ret = unsafe { libc::setregid(rgid.as_raw(), egid.as_raw()) };
nix::Error::result(ret).map(drop)
}

#[cfg(all(unix, not(any(target_os = "wasi", target_os = "android"))))]
// cfg from nix
#[cfg(any(
target_os = "android",
target_os = "freebsd",
target_os = "linux",
target_os = "openbsd"
))]
#[pyfunction]
fn initgroups(user_name: PyStrRef, gid: Gid, vm: &VirtualMachine) -> PyResult<()> {
let user = user_name.to_cstring(vm)?;
Expand Down
Loading