Fix text files with mixed EOL (#260)

* fix some end of line bugs * reduce change Co-authored-by: Lee Thomason <leet@unity3d.com>
bkaradzic · Feb 6, 2021 · 0c7e4c1 · 0c7e4c1
1 parent 4a0ee26
commit 0c7e4c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/include/bx/inline/string.inl b/include/bx/inline/string.inl
@@ -276,7 +276,7 @@ namespace bx
 
 			StringView line(curr.getPtr(), m_curr.getPtr() );
 
-			return strRTrim(line, "\n\r");
+			return strRTrim(strRTrim(line, "\n"), "\r");
 		}
 
 		return m_curr;

diff --git a/src/string.cpp b/src/string.cpp
@@ -564,23 +564,13 @@ namespace bx
 	{
 		StringView str(_str);
 
-		for (; str.getPtr() != _str.getTerm()
-			; str = StringView(min(str.getPtr() + kFindStep, _str.getTerm() ), min(str.getPtr() + kFindStep*2, _str.getTerm() ) )
-			)
+		// This method returns the character past the \n, so
+		// there is no need to look for he \r which preceedes it.
+		StringView eol = strFind(str, "\n");
+		if (!eol.isEmpty() )
 		{
-			StringView eol = strFind(str, "\r\n");
-			if (!eol.isEmpty() )
-			{
-				return StringView(eol.getTerm(), _str.getTerm() );
-			}
-
-			eol = strFind(str, '\n');
-			if (!eol.isEmpty() )
-			{
-				return StringView(eol.getTerm(), _str.getTerm() );
-			}
+			return StringView(eol.getTerm(), str.getTerm() );
 		}
-
 		return StringView(_str.getTerm(), _str.getTerm() );
 	}