correctly summarize ws fixes

Author: lws-team

CMakeLists.txt

@@ -104,4 +104,14 @@ add_test(NAME fixdiff7
 		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
 	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/7)
 
+add_test(NAME fixdiff8
+	 COMMAND ${CMAKE_COMMAND}
+	 	-DCMD=$<TARGET_FILE:${PROJECT_NAME}>
+		-DSRC=deaddrop.js
+		-DPATCH=gemini.patch
+		-DEXPSHA=0549dec027cd6e589d998c4fc423beaab919a10a563e4f3e770c952dc3b0c55c
+		-DEXPSHA_WIN=2e6b9b12ae0128c9edfc109744b9c67848712b0521c322a45104895aa4cbc3b1
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
+	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/8)
+
 

fixdiff.c

@@ -116,6 +116,9 @@ typedef struct {
 
 	int		pending_empty_lines;
 
+	int		whitespace_corrected[64];
+	int		count_whitespace_corrected;
+
 	char		ongoing;
 	char		skip_this_one;
 	char		lead_in_active;
@@ -399,13 +402,16 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 		return 1;
 	}
 
+	pdp->count_whitespace_corrected = 0;
+
 	/*
 	 * Outer loop walks through each line in source.
 	 * Inner loop tries to match starting from that line
 	 */
 
 	while (!hit) {
 		line_ending_t let, les;
+		int n;
 
 		init_lbuf(&lb, "src_comp");
 		lb.fd = open(pdp->pf, OFLAGS(O_RDONLY));
@@ -484,7 +490,12 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 				if ((p1 < p1_end) != (p2 < p2_end))
 					goto record_breakage;
 
-				elog("(fixable whitespace-only difference at stanza line %d)\n", lb_temp.li);
+				for (n = 0; n < pdp->count_whitespace_corrected; n++)
+					if (pdp->whitespace_corrected[n] == lb_temp.li)
+						break;
+				if (n == pdp->count_whitespace_corrected &&
+				    pdp->count_whitespace_corrected < sizeof(pdp->whitespace_corrected) / sizeof(int))
+					pdp->whitespace_corrected[pdp->count_whitespace_corrected++] = lb_temp.li;
 
 				/*
 				 * We have to take care about picking up windows _TEXT
@@ -592,8 +603,7 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 				}
 
 				if (lea != LE_ZERO)
-					if (write(lb_temp.fd, "\n", TO_POSLEN(1)) !=
-						  (ssize_t)1) {
+					if (write(lb_temp.fd, "\n", TO_POSLEN(1)) != (ssize_t)1) {
 						close(lb_ef.fd);
 						pdp->reason = "failed to write extra "
 								"stanza trailer to temp file";
@@ -614,6 +624,10 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 
 			close(lb_ef.fd);
 		}
+
+		if (pdp->count_whitespace_corrected)
+			elog("    (fixed %d whitespace-only differences in stanza)\n",
+			     pdp->count_whitespace_corrected);
 	}
 
 out: