Add "Ignore missing trailing EOL" option to Compare settings (#2573)

.gitattributes

@@ -2,3 +2,4 @@ Docs/Manual/Manual.cfg	text eol=lf
 Docs/Manual/**/*.xml	text eol=lf
 Translations/**/*.po	text eol=lf
 Translations/**/*.pot	text eol=lf
+Testing/Data/Compare/**/ignore_eof_*.txt -text

Src/CompareEngines/ByteComparator.cpp

@@ -340,6 +340,8 @@ ByteComparator::COMP_RESULT ByteComparator::CompareBuffers(
 			}
 			else // don't skip blank lines, but still ignore eol difference
 			{
+				const char* ptr0b = ptr0;
+				const char* ptr1b = ptr1;
 				HandleSide0Eol((char **) &ptr0, end0, eof0);
 				HandleSide1Eol((char **) &ptr1, end1, eof1);
 
@@ -353,6 +355,8 @@ ByteComparator::COMP_RESULT ByteComparator::CompareBuffers(
 					if ((!m_eol0 || !m_eol1) && (orig0 == end0 || orig1 == end1))
 					{
 						// one side had an end-of-line, but the other didn't
+						ptr0 = ptr0b;
+						ptr1 = ptr1b;
 						result = RESULT_DIFF;
 						goto exit;
 					}
@@ -385,7 +389,7 @@ ByteComparator::COMP_RESULT ByteComparator::CompareBuffers(
 					goto need_more;
 				else
 				{
-					result = RESULT_SAME;
+					result = (m_eol0 == m_eol1) ? RESULT_SAME : RESULT_DIFF;
 					goto exit;
 				}
 			}

Src/CompareEngines/ByteCompare.cpp

@@ -80,6 +80,7 @@ int ByteCompare::CompareFiles(DiffFileData* diffData)
 	// because transform code converted any UCS-2 files to UTF-8
 	// We could compare directly in UCS-2LE here, as an optimization, in that case
 	char buff[2][WMCMPBUFF]; // buffered access to files
+	std::string lasteol[2];
 	int i;
 	unsigned diffcode = 0;
 
@@ -126,11 +127,23 @@ int ByteCompare::CompareFiles(DiffFileData* diffData)
 				if (rtn < space)
 					eof[i] = true;
 				bfend[i] += rtn;
+				if (m_pOptions->m_bIgnoreMissingTrailingEol)
+				{
+					for (int64_t j = (std::max)(bfstart[i], bfend[i] - 4); j < bfend[i]; ++j)
+					{
+						const char c = buff[i][j];
+						if (c == '\r' || c == '\n')
+							lasteol[i].push_back(c);
+						else
+							lasteol[i].clear();
+					}
+				}
 				if (diffData->m_inf[0].desc == diffData->m_inf[1].desc)
 				{
 					bfstart[1] = bfstart[0];
 					bfend[1] = bfend[0];
 					eof[1] = eof[0];
+					lasteol[1] = lasteol[0];
 					diffData->m_FileLocation[1] = diffData->m_FileLocation[0];
 					memcpy(&buff[1][bfend[1] - rtn], &buff[0][bfend[0] - rtn], rtn);
 					break;
@@ -165,7 +178,21 @@ int ByteCompare::CompareFiles(DiffFileData* diffData)
 			}
 			else
 			{
-				diffcode |= DIFFCODE::DIFF;
+				if (m_pOptions->m_bIgnoreMissingTrailingEol)
+				{
+					if ((eof[0] || eof[1]) &&
+						((end0 - ptr0 <= 1 && (lasteol[0] == "\r" || lasteol[0] == "\n" || lasteol[0] == "\r\n") && (end1 == ptr1))) ||
+						((end0 - ptr0 == 2 && (lasteol[0] == "\r\n") && (end1 == ptr1))) ||
+						((end1 - ptr1 <= 1 && (lasteol[1] == "\r" || lasteol[1] == "\n" || lasteol[1] == "\r\n") && (end0 == ptr0))) ||
+						((end1 - ptr1 == 2 && (lasteol[1] == "\r\n") && (end0 == ptr0))))
+						;
+					else
+						diffcode |= DIFFCODE::DIFF;
+				}
+				else
+				{
+					diffcode |= DIFFCODE::DIFF;
+				}
 				ptr0 = end0;
 				ptr1 = end1;
 				// move our current pointers over what we just compared

Src/CompareEngines/Wrap_DiffUtils.cpp

@@ -113,6 +113,7 @@ int DiffUtils::CompareFiles(DiffFileData* diffData)
 	if (script != nullptr)
 	{
 		const bool usefilters = m_pDiffWrapper->GetOptions().m_filterCommentsLines ||
+			m_pDiffWrapper->GetOptions().m_bIgnoreMissingTrailingEol ||
 			(m_pDiffWrapper->GetFilterList() && m_pDiffWrapper->GetFilterList()->HasRegExps()) ||
 			(m_pDiffWrapper->GetSubstitutionList() && m_pDiffWrapper->GetSubstitutionList()->HasRegExps());
 

Src/CompareOptions.cpp

@@ -20,6 +20,7 @@ CompareOptions::CompareOptions()
 , m_bIgnoreCase(false)
 , m_bIgnoreEOLDifference(false)
 , m_bIgnoreNumbers(false)
+, m_bIgnoreMissingTrailingEol(false)
 {
 }
 
@@ -48,6 +49,7 @@ void CompareOptions::SetFromDiffOptions(const DIFFOPTIONS &options)
 	m_bIgnoreCase = options.bIgnoreCase;
 	m_bIgnoreEOLDifference = options.bIgnoreEol;
 	m_bIgnoreNumbers = options.bIgnoreNumbers;
+	m_bIgnoreMissingTrailingEol = options.bIgnoreMissingTrailingEol;
 }
 
 /**
@@ -187,6 +189,7 @@ void DiffutilsOptions::GetAsDiffOptions(DIFFOPTIONS &options) const
 	options.bIgnoreEol = m_bIgnoreEOLDifference;
 	options.bIgnoreNumbers = m_bIgnoreNumbers;
 	options.nDiffAlgorithm = m_diffAlgorithm;
+	options.bIgnoreMissingTrailingEol = m_bIgnoreMissingTrailingEol;
 
 	switch (m_ignoreWhitespace)
 	{

Src/CompareOptions.h

@@ -87,6 +87,7 @@ struct DIFFOPTIONS
 	bool bFilterCommentsLines; /**< Ignore Multiline comments differences -option. */
 	bool bIndentHeuristic; /**< Ident heuristic -option */
 	bool bCompletelyBlankOutIgnoredChanges;
+	bool bIgnoreMissingTrailingEol; /**< Ignore missing trailing EOL -option. */
 };
 
 /**
@@ -105,6 +106,7 @@ class CompareOptions
 	bool m_bIgnoreCase; /**< Ignore case differences? */
 	bool m_bIgnoreNumbers; /**< Ignore number differences? */
 	bool m_bIgnoreEOLDifference; /**< Ignore EOL style differences? */
+	bool m_bIgnoreMissingTrailingEol; /**< Ignore missing trailing EOL */
 };
 
 /**