Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Port setenv_lock/unsetenv_lock

Browse source
This commit is contained in:
Johannes Altmanninger 2024-01-01 21:29:05 +01:00
parent d1e3de7c8a
commit cd19f00531
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fish-rust/src/env/mod.rs vendored
View file

@ -6,7 +6,10 @@ pub mod var;
use crate::common::ToCString;
pub use env_ffi::{EnvDynFFI, EnvStackRefFFI, EnvStackSetResult};
pub use environment::*;
use std::sync::atomic::{AtomicBool, AtomicUsize};
use std::sync::{
atomic::{AtomicBool, AtomicUsize},
Mutex,
};
pub use var::*;
/// Limit `read` to 100 MiB (bytes, not wide chars) by default. This can be overridden with the
@ -26,14 +29,16 @@ pub static CURSES_INITIALIZED: AtomicBool = AtomicBool::new(false);
#[no_mangle]
pub static TERM_HAS_XN: AtomicBool = AtomicBool::new(false);
static SETENV_LOCK: Mutex<()> = Mutex::new(());
mod ffi {
extern "C" {
pub fn setenv_lock(
pub fn setenv(
name: *const libc::c_char,
value: *const libc::c_char,
overwrite: libc::c_int,
);
pub fn unsetenv_lock(name: *const libc::c_char);
pub fn unsetenv(name: *const libc::c_char);
}
}
@ -45,16 +50,18 @@ mod ffi {
pub fn setenv_lock<S1: ToCString, S2: ToCString>(name: S1, value: S2, overwrite: bool) {
let name = name.to_cstring();
let value = value.to_cstring();
let _lock = SETENV_LOCK.lock();
unsafe {
self::ffi::setenv_lock(name.as_ptr(), value.as_ptr(), libc::c_int::from(overwrite));
self::ffi::setenv(name.as_ptr(), value.as_ptr(), libc::c_int::from(overwrite));
}
}
/// Unsets an environment variable after obtaining a lock, to try and improve the safety of
/// environment variables.
pub fn unsetenv_lock<S: ToCString>(name: S) {
let name = name.to_cstring();
let _lock = SETENV_LOCK.lock();
unsafe {
let name = name.to_cstring();
self::ffi::unsetenv_lock(name.as_ptr());
self::ffi::unsetenv(name.as_ptr());
}
}