X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fwiki%2Fserv_wiki.c;h=680f63733aed4c47088b8da5b60c075a87f8b1fb;hb=99f12b7b0638f80c89d49d6206434294525e3a20;hp=242f52d0457a46e85cbf6500d413472a710e55f6;hpb=06dbca681a76e32927648a28ad644a41d4b150f6;p=citadel.git

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 242f52d04..680f63733 100644
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -168,7 +168,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
 	fclose(fp);
 
 	snprintf(diff_cmd, sizeof diff_cmd,
-		"diff -u %s %s >%s",
+		DIFF " -u %s %s >%s",
 		diff_new_filename,
 		((old_msg != NULL) ? diff_old_filename : "/dev/null"),
 		diff_out_filename
@@ -193,7 +193,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
 		fclose(fp);
 	}
 
-	syslog(LOG_DEBUG, "diff length is %d bytes", diffbuf_len);
+	syslog(LOG_DEBUG, "diff length is "SIZE_T_FMT" bytes", diffbuf_len);
 
 	unlink(diff_old_filename);
 	unlink(diff_new_filename);
@@ -434,7 +434,7 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
 	syslog(LOG_DEBUG, "callback found rev: %s\n", this_rev);
 
 	/* Perform the patch */
-	fp = popen("patch -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w");
+	fp = popen(PATCH " -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w");
 	if (fp) {
 		/* Replace the filenames in the patch with the tempfilename we're actually tweaking */
 		fprintf(fp, "--- %s\n", hecbd->tempfilename);
@@ -697,6 +697,6 @@ CTDL_MODULE_INIT(wiki)
 		CtdlRegisterProtoHook(cmd_wiki, "WIKI", "Commands related to Wiki management");
 	}
 
-	/* return our Subversion id for the Log */
+	/* return our module name for the log */
 	return "wiki";
 }