From b9e5b22f7d1b68a070809ac32fbe858c90e4dade Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 9 Sep 2023 18:59:25 -0600
Subject: [PATCH] Always return C locale from setlocale
---
src/header/locale/mod.rs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/header/locale/mod.rs b/src/header/locale/mod.rs
index 130d5be28..d2b51220f 100644
--- a/src/header/locale/mod.rs
+++ b/src/header/locale/mod.rs
@@ -60,10 +60,7 @@ pub unsafe extern "C" fn localeconv() -> *mut lconv {
}
#[no_mangle]
-pub unsafe extern "C" fn setlocale(_option: c_int, val: *const c_char) -> *mut c_char {
- if val.is_null() {
- return C_LOCALE.as_mut_ptr() as *mut c_char;
- }
+pub unsafe extern "C" fn setlocale(_option: c_int, _val: *const c_char) -> *mut c_char {
// TODO actually implement
- ptr::null_mut()
+ C_LOCALE.as_mut_ptr() as *mut c_char
}
--
GitLab