[Bf-blender-cvs] [37cef86f0d7] master: Fix: msgfmt add support for cr-lf style line endings

Lazydodo noreply at git.blender.org
Sun Aug 4 19:46:05 CEST 2019


Commit: 37cef86f0d7a4c617d651f56b1c5347e7ec7d479
Author: Lazydodo
Date:   Sun Aug 4 11:46:00 2019 -0600
Branches: master
https://developer.blender.org/rB37cef86f0d7a4c617d651f56b1c5347e7ec7d479

Fix: msgfmt add support for cr-lf style line endings

linux did not recognize cr as a valid character.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D5337

===================================================================

M	source/blender/blentranslation/msgfmt/msgfmt.c

===================================================================

diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c
index f226699d8bf..86d55e203d9 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -82,12 +82,12 @@ static char *trim(char *str)
     return str;
   }
 
-  for (i = 0; i < len && ELEM(str[0], ' ', '\t', '\n'); str++, i++) {
+  for (i = 0; i < len && ELEM(str[0], ' ', '\t', '\r','\n'); str++, i++) {
     /* pass */
   }
 
   char *end = &str[len - 1 - i];
-  for (i = len; i > 0 && ELEM(end[0], ' ', '\t', '\n'); end--, i--) {
+  for (i = len; i > 0 && ELEM(end[0], ' ', '\t', '\r','\n'); end--, i--) {
     /* pass */
   }



More information about the Bf-blender-cvs mailing list