[PATCH 3/3] Fix parsing of Windows new lines on Mk6 import

Miika Turkia miika.turkia at gmail.com
Sat Nov 15 02:19:12 PST 2014


Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 file.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/file.c b/file.c
index 29bbea5..5e8ab38 100644
--- a/file.c
+++ b/file.c
@@ -423,9 +423,14 @@ char *parse_mkvi_value(const char *haystack, const char *needle)
 			valueptr += 2;
 		}
 		if ((endptr = strstr(lineptr, "\n")) != NULL) {
+			char terminator = '\n';
+			if (*(endptr - 1) == '\r') {
+				--endptr;
+				terminator = '\r';
+			}
 			*endptr = 0;
 			ret = strdup(valueptr);
-			*endptr = '\n';
+			*endptr = terminator;
 
 		}
 	}
-- 
1.9.1



More information about the subsurface mailing list