godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fix reading Unicode from stdio.

Browse Source
This commit is contained in:
bruvzg
2022-12-21 08:38:14 +02:00
parent 2a04b18d37
commit 3d8a942a56
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/unix/os_unix.cpp
View File

@@ -152,12 +152,10 @@ Vector<String> OS_Unix::get_video_adapter_driver_info() const {
String OS_Unix::get_stdin_string(bool p_block) { String OS_Unix::get_stdin_string(bool p_block) {
if (p_block) { if (p_block) {
char buff[1024]; char buff[1024];
String ret = stdin_buf + fgets(buff, 1024, stdin); return String::utf8(fgets(buff, 1024, stdin));
stdin_buf = "";
return ret;
} }
return ""; return String();
} }
Error OS_Unix::get_entropy(uint8_t *r_buffer, int p_bytes) { Error OS_Unix::get_entropy(uint8_t *r_buffer, int p_bytes) {

2
drivers/unix/os_unix.h
View File

@@ -46,8 +46,6 @@ protected:
virtual void finalize_core() override; virtual void finalize_core() override;
String stdin_buf;
public: public:
OS_Unix(); OS_Unix();

7
platform/windows/os_windows.cpp
View File

@@ -1164,8 +1164,11 @@ bool OS_Windows::set_environment(const String &p_var, const String &p_value) con
String OS_Windows::get_stdin_string(bool p_block) { String OS_Windows::get_stdin_string(bool p_block) {
if (p_block) { if (p_block) {
char buff[1024]; WCHAR buff[1024];
return fgets(buff, 1024, stdin); DWORD count = 0;
if (ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), buff, 1024, &count, nullptr)) {
return String::utf16((const char16_t *)buff, count);
}
} }
return String(); return String();