diff options
| author | Eric Huss <eric@huss.org> | 2021-03-07 11:32:42 -0800 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2021-03-07 11:32:42 -0800 |
| commit | acdca316c3d42299d31c1b47eb792006ffdfc29c (patch) | |
| tree | 4a7818fb7d8fb30cee7c6512014cc3b191029d37 /library/std/src/sys/unix/process | |
| parent | 66ec64ccf31883cd2c28d045912a76179c0c6ed2 (diff) | |
| download | rust-acdca316c3d42299d31c1b47eb792006ffdfc29c.tar.gz rust-acdca316c3d42299d31c1b47eb792006ffdfc29c.zip | |
Revert "use RWlock when accessing os::env #81850"
This reverts commit 354f19cf2475148994954b6783341620c7445071, reversing changes made to 0cfba2fd090834c909d5ed9deccdee8170da791b.
Diffstat (limited to 'library/std/src/sys/unix/process')
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs index 9e82df7755e..2746f87468d 100644 --- a/library/std/src/sys/unix/process/process_unix.rs +++ b/library/std/src/sys/unix/process/process_unix.rs @@ -47,7 +47,7 @@ impl Command { // a lock any more because the parent won't do anything and the child is // in its own process. let result = unsafe { - let _env_lock = sys::os::env_read_lock(); + let _env_lock = sys::os::env_lock(); cvt(libc::fork())? }; @@ -124,7 +124,7 @@ impl Command { // Similar to when forking, we want to ensure that access to // the environment is synchronized, so make sure to grab the // environment lock before we try to exec. - let _lock = sys::os::env_read_lock(); + let _lock = sys::os::env_lock(); let Err(e) = self.do_exec(theirs, envp.as_ref()); e @@ -404,7 +404,7 @@ impl Command { cvt_nz(libc::posix_spawnattr_setflags(attrs.0.as_mut_ptr(), flags as _))?; // Make sure we synchronize access to the global `environ` resource - let _env_lock = sys::os::env_read_lock(); + let _env_lock = sys::os::env_lock(); let envp = envp.map(|c| c.as_ptr()).unwrap_or_else(|| *sys::os::environ() as *const _); cvt_nz(libc::posix_spawnp( &mut p.pid, |
