Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86936 from akx/env-utf-8

Browse Source 
Attempt parsing environment variables as UTF-8
This commit is contained in:
Rémi Verschelde
2024-03-11 14:02:22 +01:00
parent 9a098458cc a4c5dae8cb
commit b0d07b1bc2
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/unix/os_unix.cpp
View File

@@ -705,10 +705,15 @@ bool OS_Unix::has_environment(const String &p_var) const {
}
String OS_Unix::get_environment(const String &p_var) const {
if (getenv(p_var.utf8().get_data())) {
return getenv(p_var.utf8().get_data());
const char *val = getenv(p_var.utf8().get_data());
if (val == nullptr) { // Not set; return empty string
return "";
}
return "";
String s;
if (s.parse_utf8(val) == OK) {
return s;
}
return String(val); // Not valid UTF-8, so return as-is
}
void OS_Unix::set_environment(const String &p_var, const String &p_value) const {