whitespace: trim trailing before comparison

Author: lws-team

CMakeLists.txt

@@ -114,4 +114,14 @@ add_test(NAME fixdiff8
 		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
 	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/8)
 
+add_test(NAME fixdiff9
+	 COMMAND ${CMAKE_COMMAND}
+	 	-DCMD=$<TARGET_FILE:${PROJECT_NAME}>
+		-DSRC=s-ws-builder.c
+		-DPATCH=gemini.patch
+		-DEXPSHA=ac6512d0861605b5dbea4c07e15faed64fab98742c7b9830ce6adfd0af077d09
+		-DEXPSHA_WIN=2e6b9b12ae0128c9edfc109744b9c67848712b0521c322a45104895aa4cbc3b1
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
+	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/9)
+
 

fixdiff.c

@@ -466,6 +466,17 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 				char *p1 = in_temp + 1, *p1_end = p1 + lt - 1 - (int)let,
 				     *p2 = in_src,      *p2_end = p2 + ls     - (int)les;
 
+			         /*
+				  * Let's trim back any trailing whitespace so that
+				  * either source or patch with it and the other not
+				  * doesn't trigger a mismatch
+				  */
+
+				while (p1_end > p1 && (p1_end[-1] == ' ' || p1_end[-1] == '\t'))
+					p1_end--;
+				while (p2_end > p2 && (p2_end[-1] == ' ' || p2_end[-1] == '\t'))
+					p2_end--;
+
 				while (p1 < p1_end && p2 < p2_end) {
 					char wst1 = 0, wst2 = 0;