multi-source patch

Author: lws-team

CMakeLists.txt

@@ -12,6 +12,8 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 # separate sha256 for windows, because both stdout shell redirect
 # and piping stdout onward are in _TEXT
 
+# single patched file, directly taken from Gemini 2.5 copy button
+
 add_test(NAME lws1
 	 COMMAND ${CMAKE_COMMAND}
 	 	-DCMD=$<TARGET_FILE:${PROJECT_NAME}>
@@ -22,14 +24,49 @@ add_test(NAME lws1
 		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
 	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/1)
 
+ # two concatenated single file patches
+
 add_test(NAME lws2
 	 COMMAND ${CMAKE_COMMAND}
 	 	-DCMD=$<TARGET_FILE:${PROJECT_NAME}>
 		-DSRC=deaddrop.js
 		-DSRC1=protocol_lws_deaddrop.c
 		-DPATCH=gemini.patch
-		-DEXPSHA=0f988ae2f642a825188448e4bee9db8943050e80e075dbcd6fc4ed9ada87f6fb
-		-DEXPSHA_WIN=2e6b9b12ae0128c9edfc109744b9c67848712b0521c322a45104895aa4cbc3b1
+		-DEXPSHA=41e61ec55614da2edef64618cd60977b9403fe0d9fdd9b04d89ae38e38896799
+		-DEXPSHA1=c742cdad75b3f4f1d742b4cf135079ba319f9b85ce8615799e2ed4baa4e12b97
+		-DEXPSHA_WIN=2b8657443708a63097ade2a800cbcf95a23d40526b9c2173b2980b6773e8ab39
+		-DEXPSHA1_WIN=dadd4162eee0c8acdbdeb43cb9e97c448c766dbab2bec9d866fcd5a76243b593
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
+	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/2)
+
+ # two concatenated patches using git style diff and index lines (otherwise same as above)
+
+ add_test(NAME lws2a
+	 COMMAND ${CMAKE_COMMAND}
+	 	-DCMD=$<TARGET_FILE:${PROJECT_NAME}>
+		-DSRC=deaddrop.js
+		-DSRC1=protocol_lws_deaddrop.c
+		-DPATCH=gemini2.patch
+		-DEXPSHA=41e61ec55614da2edef64618cd60977b9403fe0d9fdd9b04d89ae38e38896799
+		-DEXPSHA1=c742cdad75b3f4f1d742b4cf135079ba319f9b85ce8615799e2ed4baa4e12b97
+		-DEXPSHA_WIN=2b8657443708a63097ade2a800cbcf95a23d40526b9c2173b2980b6773e8ab39
+		-DEXPSHA1_WIN=dadd4162eee0c8acdbdeb43cb9e97c448c766dbab2bec9d866fcd5a76243b593
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
+	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/2)
+
+ # two concatenated patches using git style diff and index lines with extra newline at end
+ # (otherwise same as above)
+
+ add_test(NAME lws2b
+	 COMMAND ${CMAKE_COMMAND}
+	 	-DCMD=$<TARGET_FILE:${PROJECT_NAME}>
+		-DSRC=deaddrop.js
+		-DSRC1=protocol_lws_deaddrop.c
+		-DPATCH=gemini3.patch
+		-DEXPSHA=41e61ec55614da2edef64618cd60977b9403fe0d9fdd9b04d89ae38e38896799
+		-DEXPSHA1=c742cdad75b3f4f1d742b4cf135079ba319f9b85ce8615799e2ed4baa4e12b97
+		-DEXPSHA_WIN=2b8657443708a63097ade2a800cbcf95a23d40526b9c2173b2980b6773e8ab39
+		-DEXPSHA1_WIN=dadd4162eee0c8acdbdeb43cb9e97c448c766dbab2bec9d866fcd5a76243b593
 		-P ${CMAKE_CURRENT_SOURCE_DIR}/tests/runtest.cmake
 	 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/2)
 

README.md

@@ -29,7 +29,7 @@ legible diffs.
 This utility adjusts the diff stanzas sent to it on stdin and produces new stanza
 headers with accurate line counts on stdout.
 
-It covers:
+It silently repairs:
 
  - wrong "before" line in original stanza header
  - wrong "before" line count in original stanza header
@@ -44,7 +44,13 @@ It finds and scans the sources the patches apply to and uses the diff stanza to
 find the original line it applied to by itself, along with the original line
 count and, considering earlier stanzas, the line in the modified file it appears
 at and the new line count for the stanza.  Thus, it does not use the incoming
-broken stanza header information at all and replaces all the @@ lines.
+broken stanza header information at all and replaces all the @@ lines with
+correct numbers according to the changed and unchanged sources, and the actual
+diff contents inside the stanza.
+
+It handles diffs starting with --- as produced by most LLMs, also those with
+diff and index headers, and supports any combination of concatenated diffs
+targeting different files in one step.
 
 ## Building
 
@@ -64,3 +70,5 @@ $ cmake ..
 $ make && sudo make install
 ```
 
+Selftests can be run after build with `ctest --output-on-failure`.
+

fixdiff.c

@@ -395,8 +395,6 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 			if (hit)
 				break;
 
-			fprintf(stderr, "'%s' '%s\n", in_temp + 1, in_src);
-
 			if (fixdiff_strcmp(in_temp + 1, lt - 1, &let, in_src, ls, &les))
 				break;
 		}
@@ -700,6 +698,8 @@ main(int argc, char *argv[])
 						     in[2] == '-' &&
 						     in[3] == ' ') {
 						dp.d = DSS_MUST_PPP;
+						if (fixdiff_stanza_end(&dp))
+							goto bail;
 						break;
 					}
 
@@ -737,6 +737,13 @@ main(int argc, char *argv[])
 					goto bail;
 				break;
 			}
+
+			if (in[0] == 0xa) {
+				/* we can often find this from extra lines at EOT */
+				fprintf(stderr, "Skipping unexpected newline\n");
+				continue;
+			}
+
 			fprintf(stderr, "'%c' (0x%x)\n", in[0], in[0]);
 			dp.reason = "unexpected character in stanza";
 			goto bail;

tests/2/deaddrop.js-orig

@@ -1,6 +1,6 @@
 (function() {
 
-	var server_max_size = 0, ws;
+	var server_max_size = 0, username = "", ws;
 
 	function san(s)
 	{
@@ -16,7 +16,7 @@
 
 	function pad(n) {
 		return n < 10 ? '0' + n : n;
- 	}
+	}
 
 	function lws_urlencode(s)
 	{
@@ -68,15 +68,15 @@
 	{
 		var da = document.getElementById("da");
 
-		e.preventDefault();	
+		e.preventDefault();
 		da.classList.remove("trot");
 	}
 
 	function da_over(e)
 	{
 		var da = document.getElementById("da");
 
-		e.preventDefault();		
+		e.preventDefault();
 		da.classList.add("trot");
 	}
 
@@ -88,39 +88,38 @@
 				t.deleteRow(n);
 	}
 
-	function do_upload(file) {
-		var formData = new FormData();
+	/*
+	 * Generic uploader: takes FormData, a display name and a display size
+	 */
+	function _do_upload(formData, displayName, displaySize) {
 		var t = document.getElementById("ongoing");
-
-		formData.append("file", file);
-
 		var row = t.insertRow(0), c1 = row.insertCell(0),
-		c2 = row.insertCell(1), c3 = row.insertCell(2);
+		    c2 = row.insertCell(1), c3 = row.insertCell(2);
 
 		c1.classList.add("ogn");
 		c1.classList.add("r");
 
-		if (file.size > server_max_size) {
+		if (displaySize > server_max_size) {
 			c1.innerHTML = "Too Large";
 			c1.classList.add("err");
 		} else
 			c1.innerHTML = "<img class=\"working\">";
 
 		c2.classList.add("ogn");
 		c2.classList.add("r");
-		c2.innerHTML = humanize(file.size);
+		c2.innerHTML = humanize(displaySize);
 
 		c3.classList.add("ogn");
-		c3.innerHTML = san(file.name);
+		c3.innerHTML = san(displayName);
 
-		if (file.size > server_max_size)
+		if (displaySize > server_max_size)
 			return;
 
-		fetch("upload/" + lws_urlencode(file.name), {
+		fetch("upload/" + lws_urlencode(displayName), {
 			method: "POST",
 			body: formData
 		})
-		.then((e) => { /* this just means we got a response code */			  
+		.then((e) => { /* this just means we got a response code */
 			var us = e.url.split("/"), ul = us[us.length - 1], n;
 
 			for (n = 0; n < t.rows.length; n++)
@@ -149,10 +148,16 @@
 		});
 	}
 
+	function do_upload(file) {
+		var formData = new FormData();
+		formData.append("file", file);
+		_do_upload(formData, file.name, file.size);
+	}
+
 	function da_drop(e) {
 		var da = document.getElementById("da");
 
-		e.preventDefault();		
+		e.preventDefault();
 		da.classList.remove("trot");
 
 		clear_errors();
@@ -169,24 +174,48 @@
 		([...fi.files]).forEach(do_upload);
 	}
 
-	function body_drop(e) {
+	function upl_text_button(e) {
+		var content = document.getElementById("text_content"),
+		    d = new Date(),
+		    ts = d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' +
+		         pad(d.getDate()) + '_' + pad(d.getHours()) + '-' +
+			 pad(d.getMinutes()) + '-' + pad(d.getSeconds()),
+		    generated_filename = ts + (username ? '_' + username : '') + '.txt',
+		    formData = new FormData(), blob;
+
 		e.preventDefault();
-	}
+		clear_errors();
 
-	function inp() {
-		var fi = document.getElementById("file"),
-		upl = document.getElementById("upl");
-		console.log("inp");
-		upl.disabled = !fi.files.length;
+		blob = new Blob([content.value], { type: "text/plain" });
+		formData.append("file", blob, generated_filename);
+
+		_do_upload(formData, generated_filename, blob.size);
+		content.value = "";
+		text_inp(); // Manually update button state after clearing
 	}
 
 	function delfile(e)
 	{
 		e.stopPropagation();
 		e.preventDefault();
 
-		ws.send("{\"del\":\"" + decodeURI(e.target.getAttribute("file")) +
-		"\"}");
+		ws.send("{\"del\":\"" + e.target.getAttribute("file") + "\"}");
+	}
+
+	function body_drop(e) {
+		e.preventDefault();
+	}
+
+	function file_inp() {
+		var fi = document.getElementById("file"),
+		upl = document.getElementById("upl");
+		upl.disabled = !fi.files.length;
+	}
+
+	function text_inp() {
+		var content = document.getElementById("text_content"),
+		    upl_text = document.getElementById("upl_text");
+		upl_text.disabled = !content.value.length;
 	}
 
 	function get_appropriate_ws_url(extra_url)
@@ -222,16 +251,21 @@
 
 	document.addEventListener("DOMContentLoaded", function() {
 		var da = document.getElementById("da"),
-		fi = document.getElementById("file"),
-		upl = document.getElementById("upl");
+		    fi = document.getElementById("file"),
+		    upl = document.getElementById("upl"),
+		    text_content = document.getElementById("text_content"),
+		    upl_text = document.getElementById("upl_text");
 
 		da.addEventListener("dragenter", da_enter, false);
 		da.addEventListener("dragleave", da_leave, false);
 		da.addEventListener("dragover", da_over, false);
 		da.addEventListener("drop", da_drop, false);
 
-		upl.addEventListener("click", upl_button, false);		
-		fi.addEventListener("change", inp, false);
+		upl.addEventListener("click", upl_button, false);
+		fi.addEventListener("change", file_inp, false);
+
+		upl_text.addEventListener("click", upl_text_button, false);
+		text_content.addEventListener("input", text_inp, false);
 
 		window.addEventListener("dragover", body_drop, false);
 		window.addEventListener("drop", body_drop, false);
@@ -250,6 +284,7 @@
 				var j = JSON.parse(msg.data), s = "", n,
 				t = document.getElementById("dd-list");
 
+				username = j.user || "";
 				server_max_size = j.max_size;
 				document.getElementById("size").innerHTML =
 					"Server maximum file size " +
@@ -262,12 +297,12 @@
 					humanize(j.files[n].size) +
 					"</td><td class=\"dow\">" +
 					date.toDateString() + " " +
-					date.toLocaleTimeString() +
-					"</td><td>";
-					if (j.files[n].yours === 1)
+					date.toLocaleTimeString() + "</td><td>";
+
+					if (username) /* any authenticated user can delete */
 						s += "<img id=\"d" + n +
 					  "\" class=\"delbtn\" file=\"" +
-						lws_urlencode(san(j.files[n].name)) + "\">";
+						san(j.files[n].name) + "\">";
 					else
 						s += " ";
 
@@ -278,13 +313,12 @@
 				}
 				s += "</table>";
 
-				t.innerHTML = san(s);
+				t.innerHTML = s;
 
 				for (n = 0; n < j.files.length; n++) {
 					var d = document.getElementById("d" + n);
 					if (d)
-						d.addEventListener("click",
-								delfile, false);
+						d.addEventListener("click", delfile, false);
 				}
 			};
 
@@ -301,3 +335,4 @@
 
 	});
 }());
+