Fix problem with inconsistent EOLs

svn path=/trunk/; revision=64514
This commit is contained in:
Timo Kreuzer 2014-10-03 20:11:37 +00:00
parent 0a9f51e62d
commit cc58f75131

View file

@ -210,11 +210,14 @@ WriteLine(char *pchLine, FILE *fileOut)
pchVariable = strchr(pch, '$'); pchVariable = strchr(pch, '$');
if (pchVariable && (pchVariable < pchLineEnd)) if (pchVariable && (pchVariable < pchLineEnd))
{ {
/* Write all characters up to the $ */
fwrite(pch, 1, pchVariable - pch, fileOut); fwrite(pch, 1, pchVariable - pch, fileOut);
/* Try to find the define */
pDefine = FindDefine(pchVariable + 1, &pch); pDefine = FindDefine(pchVariable + 1, &pch);
if (pDefine != 0) if (pDefine != 0)
{ {
/* We have a define, write the value */
fwrite(pDefine->pszValue, 1, pDefine->cchValue, fileOut); fwrite(pDefine->pszValue, 1, pDefine->cchValue, fileOut);
} }
else else
@ -224,7 +227,7 @@ WriteLine(char *pchLine, FILE *fileOut)
fwrite(pchVariable, 1, pch - pchVariable, fileOut); fwrite(pchVariable, 1, pch - pchVariable, fileOut);
} }
len = pchLineEnd - pch; len = pchLineEnd - pch + 1;
} }
else else
{ {