From 0064b01ae03b2f0dfff9f858e91df0c24a468dcd Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 15 Nov 2020 06:30:29 -0800
Subject: [PATCH] Trim out \r from string

Fix #3490
---
 native/jni/utils/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/jni/utils/files.cpp b/native/jni/utils/files.cpp
index 105262cc9..b4d3696ad 100644
--- a/native/jni/utils/files.cpp
+++ b/native/jni/utils/files.cpp
@@ -340,7 +340,7 @@ void file_readline(bool trim, const char *file, const function<bool(string_view)
 	while ((read = getline(&buf, &len, fp)) >= 0) {
 		start = buf;
 		if (trim) {
-			while (read && (buf[read - 1] == '\n' || buf[read - 1] == ' '))
+			while (read && "\n\r "sv.find(buf[read - 1]) != string::npos)
 				--read;
 			buf[read] = '\0';
 			while (*start == ' ')