azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reading stdin after EOF. (#3435)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-10-08 11:05:33 +03:00
committed by GitHub
parent f1c7d9a728
commit b1710e8758
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/Porting.cpp
+5 -11
View File
@@ -78,18 +78,12 @@ int32_t consoleReadUtf8(void* utf8, uint32_t maxSizeBytes) {
#ifdef KONAN_ZEPHYR #ifdef KONAN_ZEPHYR
return 0; return 0;
#else #else
#ifdef KONAN_WASM auto length = ::read(STDIN_FILENO, utf8, maxSizeBytes - 1);
FILE* file = nullptr; if (length <= 0) return -1;
#else char* start = reinterpret_cast<char*>(utf8);
FILE* file = stdin; char* current = start + length - 1;
#endif
char* result = ::fgets(reinterpret_cast<char*>(utf8), maxSizeBytes - 1, file);
if (result == nullptr) return -1;
int32_t length = ::strlen(result);
// fgets reads until EOF or newline so we need to remove linefeeds.
char* current = result + length - 1;
bool isTrimming = true; bool isTrimming = true;
while (current >= result && isTrimming) { while (current >= start && isTrimming) {
switch (*current) { switch (*current) {
case '\n': case '\n':
case '\r': case '\r':