From: Bernardo Sulzbach <mafagafogigante@gmail.com>
Date: Mon, 12 Dec 2016 02:39:09 +0000 (-0200)
Subject: Mod dependency lists: Should have platform-independent line breaking
X-Git-Tag: 0.4.15~74
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d9675d3d922a2c8f521102c9386d14c694fda365;p=oweals%2Fminetest.git

Mod dependency lists: Should have platform-independent line breaking

This fixes a bug existing in modmgr.lua as reported by @Wuzzy2 which
caused the mod dependency list to glitch if input was using a line
terminator different than the OS default.

The C++ code does not need any changes as it already trims CR
occurrences on platforms on which the line termination sequence is LF.

Taken into account the size of the depends.txt files used, this should
not introduce a noticeable performance regression.

Fixes #4720
---

diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua
index bf87b1dfa..2b7b371bf 100644
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
@@ -296,6 +296,7 @@ function modmgr.get_dependencies(modfolder)
 		if dependencyfile then
 			local dependency = dependencyfile:read("*l")
 			while dependency do
+				dependency = dependency:gsub("\r", "")
 				if string.sub(dependency, -1, -1) == "?" then
 					table.insert(soft_dependencies, string.sub(dependency, 1, -2))
 				else