From 8e165dd308679f195af8614d62dbdb4e43238495 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Fri, 23 Oct 2009 12:51:53 +0000
Subject: [PATCH] rename wprintf to wc_printf; wchar.h also has a wprintf

---
 webcit/addressbook_popup.c |   70 +--
 webcit/auth.c              |  134 ++--
 webcit/autocompletion.c    |   10 +-
 webcit/calendar.c          |   34 +-
 webcit/calendar_tools.c    |   34 +-
 webcit/calendar_view.c     |  322 +++++-----
 webcit/context_loop.c      |    2 +-
 webcit/downloads.c         |    2 +-
 webcit/event.c             |  290 ++++-----
 webcit/floors.c            |   86 +--
 webcit/gettext.c           |   10 +-
 webcit/graphics.c          |   34 +-
 webcit/groupdav_get.c      |   12 +-
 webcit/groupdav_main.c     |    4 +-
 webcit/groupdav_options.c  |    6 +-
 webcit/groupdav_propfind.c |  216 +++----
 webcit/groupdav_put.c      |   10 +-
 webcit/iconbar.c           |    6 +-
 webcit/listsub.c           |   64 +-
 webcit/mainmenu.c          |   62 +-
 webcit/messages.c          |   52 +-
 webcit/msg_renderers.c     |   14 +-
 webcit/notes.c             |   10 +-
 webcit/openid.c            |   34 +-
 webcit/paging.c            |  114 ++--
 webcit/paramhandling.c     |   16 +-
 webcit/preferences.c       |    8 +-
 webcit/roomops.c           | 1194 ++++++++++++++++++------------------
 webcit/serv_func.c         |   24 +-
 webcit/setup.c             |    2 +
 webcit/setup_wizard.c      |   22 +-
 webcit/sieve.c             |  334 +++++-----
 webcit/smtpqueue.c         |   80 +--
 webcit/static.c            |    6 +-
 webcit/summary.c           |  142 ++---
 webcit/sysmsgs.c           |   18 +-
 webcit/tabs.c              |   30 +-
 webcit/tasks.c             |  202 +++---
 webcit/userlist.c          |   66 +-
 webcit/utils.c             |    2 +-
 webcit/vcard_edit.c        |  178 +++---
 webcit/webcit.c            |   52 +-
 webcit/webcit.h            |    2 +-
 webcit/who.c               |   76 +--
 webcit/wiki.c              |   18 +-
 45 files changed, 2053 insertions(+), 2051 deletions(-)

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 7f35fa0d5..13a2066e7 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -12,12 +12,12 @@
  */
 void address_book_popup(void) {
 	/* Open a new div, hidden initially, for address book popups. */
-	wprintf("</div>\n");	/* End of 'content' div */
-	wprintf("<div id=\"address_book_popup\" style=\"display:none;\">");
-	wprintf("<div id=\"address_book_popup_container_div\">");
-	wprintf("<div id=\"address_book_popup_middle_div\"></div>");
-	wprintf("<div id=\"address_book_inner_div\"></div>");
-	wprintf("</div>");
+	wc_printf("</div>\n");	/* End of 'content' div */
+	wc_printf("<div id=\"address_book_popup\" style=\"display:none;\">");
+	wc_printf("<div id=\"address_book_popup_container_div\">");
+	wc_printf("<div id=\"address_book_popup_middle_div\"></div>");
+	wc_printf("<div id=\"address_book_inner_div\"></div>");
+	wc_printf("</div>");
 	/* The 'address_book_popup' div will be closed by wDumpContent() */
 }
 
@@ -38,21 +38,21 @@ void display_address_book_middle_div(void) {
 
 	DefAddrBook = get_room_pref("defaddrbook");
 
-	wprintf("<table border=0 width=100%%><tr valign=middle>");
-	wprintf("<td align=left><img src=\"static/viewcontacts_32x.gif\"></td>");
-	wprintf("<td align=center>");
+	wc_printf("<table border=0 width=100%%><tr valign=middle>");
+	wc_printf("<td align=left><img src=\"static/viewcontacts_32x.gif\"></td>");
+	wc_printf("<td align=center>");
 
-	wprintf("<form>"
+	wc_printf("<form>"
 		"<select class=\"address_book_popup_title\" size=1 id=\"which_addr_book\" "
 		" onChange=\"PopulateAddressBookInnerDiv($('which_addr_book').value,'%s')\">",
 		bstr("target_input")
 	);
 
-	wprintf("<option value=\"__LOCAL_USERS__\" %s>", 
+	wc_printf("<option value=\"__LOCAL_USERS__\" %s>", 
 		(strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
 		"selected=\"selected\" ":"");
 	escputs(ChrPtr(WC->serv_info->serv_humannode));
-	wprintf("</option>\n");
+	wc_printf("</option>\n");
 
 	
 	List = NewHash(1, NULL);
@@ -69,26 +69,26 @@ void display_address_book_middle_div(void) {
 	SortByHashKey(List, 1);
 	it = GetNewHashPos(List, 0);
 	while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
-		wprintf("<option value=\"");
+		wc_printf("<option value=\"");
 		urlescputs((char*)Namee);
 		if (strcmp(ChrPtr(DefAddrBook), Namee) == 0)
-			wprintf("\" selected=\"selected\" >");
+			wc_printf("\" selected=\"selected\" >");
 		else
-			wprintf("\">");
+			wc_printf("\">");
 		escputs((char*)Namee);
-		wprintf("</option>\n");
+		wc_printf("</option>\n");
 	}
 	DeleteHashPos(&it);
 	DeleteHash(&List);
-	wprintf("</select></form>");
+	wc_printf("</select></form>");
 
-	wprintf("</td>");
-	wprintf("<td align=right "
+	wc_printf("</td>");
+	wc_printf("<td align=right "
 		"onclick=\"javascript:$('address_book_popup').style.display='none';\" "
 		"><img src=\"static/closewindow.gif\">");
-	wprintf("</td></tr></table>");
+	wc_printf("</td></tr></table>");
 
-	wprintf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
+	wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
 		bstr("target_input")
 	);
 
@@ -117,7 +117,7 @@ void display_address_book_inner_div() {
 	begin_ajax_response();
 
 	List = NewHash(1, NULL);
-	wprintf("<div align=center><form onSubmit=\"return false;\">"
+	wc_printf("<div align=center><form onSubmit=\"return false;\">"
 		"<select multiple name=\"whichaddr\" id=\"whichaddr\" size=\"15\">\n");
 
 	if (!strcasecmp(bstr("which_addr_book"), "__LOCAL_USERS__")) {
@@ -136,11 +136,11 @@ void display_address_book_inner_div() {
 		SortByHashKey(List, 1);
 		it = GetNewHashPos(List, 0);
 		while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
-			wprintf("<option value=\"");
+			wc_printf("<option value=\"");
 			escputs((char*)Namee);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs((char*)Namee);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
 		DeleteHashPos(&it);
 		DeleteHash(&List);
@@ -161,11 +161,11 @@ void display_address_book_inner_div() {
 		SortByHashKey(List, 1);
 		it = GetNewHashPos(List, 0);
 		while (GetNextHashPos(List, it, &len, &VCName, (void**)&Namee)) {
-			wprintf("<option value=\"");
+			wc_printf("<option value=\"");
 			escputs((char*)Namee);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs((char*)Namee);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
 		DeleteHashPos(&it);
 		DeleteHash(&List);
@@ -173,26 +173,26 @@ void display_address_book_inner_div() {
 		FreeStrBuf(&saved_roomname);
 	}
 
-	wprintf("</select>\n");
+	wc_printf("</select>\n");
 
-	wprintf("%s: ", _("Add"));
+	wc_printf("%s: ", _("Add"));
 
 	num_targets = num_tokens(bstr("target_input"), '|');
 	for (i=0; i<num_targets; i+=2) {
 		extract_token(target_id, bstr("target_input"), i, '|', sizeof target_id);
 		extract_token(target_label, bstr("target_input"), i+1, '|', sizeof target_label);
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", target_label);
-		wprintf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", target_id);
+		wc_printf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", target_label);
+		wc_printf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", target_id);
 	}
 
 	/* This 'close window' button works.  Omitting it because we already have a close button
 	 * in the upper right corner, and this one takes up space.
 	 *
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"close_button\" VALUE=\"%s\" ", _("Close window"));
-	wprintf("onclick=\"javascript:$('address_book_popup').style.display='none';\">");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"close_button\" VALUE=\"%s\" ", _("Close window"));
+	wc_printf("onclick=\"javascript:$('address_book_popup').style.display='none';\">");
 	 */
 
-	wprintf("</form></div>\n");
+	wc_printf("</form></div>\n");
 
 	end_ajax_response();
 }
diff --git a/webcit/auth.c b/webcit/auth.c
index 9375c1f1e..fc0da9507 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -63,7 +63,7 @@ void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *usernam
 	StrBuf *Buf = NULL;
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"login_screen\">\n");
+	wc_printf("<div id=\"login_screen\">\n");
 
 	Buf = NewStrBufPlain(NULL, StrLength(claimed_id));
 	StrEscAppend(Buf, claimed_id, NULL, 0, 0);
@@ -550,11 +550,11 @@ void do_logout(void)
 	/** Calling output_headers() this way causes the cookies to be un-set */
 	output_headers(1, 1, 0, 1, 0, 0);
 
-	wprintf("<div id=\"logout_screen\">");
-        wprintf("<div class=\"box\">");
-        wprintf("<div class=\"boxlabel\">");
-	wprintf(_("Log off"));
-        wprintf("</div><div class=\"boxcontent\">");	
+	wc_printf("<div id=\"logout_screen\">");
+        wc_printf("<div class=\"box\">");
+        wc_printf("<div class=\"boxlabel\">");
+	wc_printf(_("Log off"));
+        wc_printf("</div><div class=\"boxcontent\">");	
 	serv_puts("MESG goodbye");
 	serv_getln(buf, sizeof buf);
 
@@ -562,34 +562,34 @@ void do_logout(void)
 		if (buf[0] == '1') {
 			fmout("CENTER");
 		} else {
-			wprintf("Goodbye\n");
+			wc_printf("Goodbye\n");
 		}
 	}
 	else {
-		wprintf(_("This program was unable to connect or stay "
+		wc_printf(_("This program was unable to connect or stay "
 			"connected to the Citadel server.  Please report "
 			"this problem to your system administrator.")
 		);
-		wprintf("<a href=\"http://www.citadel.org/doku.php/"
+		wc_printf("<a href=\"http://www.citadel.org/doku.php/"
 			"faq:mastering_your_os:net#netstat\">%s</a>", 
 			_("Read More..."));
 	}
 
-	wprintf("<hr /><div class=\"buttons\"> "
+	wc_printf("<hr /><div class=\"buttons\"> "
 		"<span class=\"button_link\"><a href=\".\">");
-	wprintf(_("Log in again"));
-	wprintf("</a></span>");
+	wc_printf(_("Log in again"));
+	wc_printf("</a></span>");
 
 	/* The "close window" link is commented out because some browsers don't
 	 * allow it to work.
 	 *
-	wprintf("&nbsp;&nbsp;&nbsp;<span class=\"button_link\">"
+	wc_printf("&nbsp;&nbsp;&nbsp;<span class=\"button_link\">"
 		"<a href=\"javascript:window.close();\">");
-	wprintf(_("Close window"));
-	wprintf("</a></span>");
+	wc_printf(_("Close window"));
+	wc_printf("</a></span>");
 	 */
 
-	wprintf("</div></div></div></div>\n");
+	wc_printf("</div></div></div></div>\n");
 	wDumpContent(2);
 	end_webcit_session();
 }
@@ -606,13 +606,13 @@ void validate(void)
 	int a;
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Validate new users"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
+	wc_printf(_("Validate new users"));
+	wc_printf("</h1>");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
 	/* If the user just submitted a validation, process it... */
 	safestrncpy(buf, bstr("user"), sizeof buf);
@@ -621,7 +621,7 @@ void validate(void)
 			serv_printf("VALI %s|%s", buf, bstr("axlevel"));
 			serv_getln(buf, sizeof buf);
 			if (buf[0] != '2') {
-				wprintf("<b>%s</b><br>\n", &buf[4]);
+				wc_printf("<b>%s</b><br>\n", &buf[4]);
 			}
 		}
 	}
@@ -630,21 +630,21 @@ void validate(void)
 	serv_puts("GNUR");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '2') {
-		wprintf("<b>");
-		wprintf(_("No users require validation at this time."));
-		wprintf("</b><br>\n");
+		wc_printf("<b>");
+		wc_printf(_("No users require validation at this time."));
+		wc_printf("</b><br>\n");
 		wDumpContent(1);
 		return;
 	}
 	if (buf[0] != '3') {
-		wprintf("<b>%s</b><br>\n", &buf[4]);
+		wc_printf("<b>%s</b><br>\n", &buf[4]);
 		wDumpContent(1);
 		return;
 	}
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"auth_validate\"><tr><td>\n");
-	wprintf("<div id=\"validate\">");
+	wc_printf("<div id=\"validate\">");
 
 	safestrncpy(user, &buf[4], sizeof user);
 	serv_printf("GREG %s", user);
@@ -655,7 +655,7 @@ void validate(void)
 			serv_getln(buf, sizeof buf);
 			++a;
 			if (a == 1)
-				wprintf("#%s<br><H1>%s</H1>",
+				wc_printf("#%s<br><H1>%s</H1>",
 					buf, &cmd[4]);
 			if (a == 2) {
 				char *pch;
@@ -692,41 +692,41 @@ void validate(void)
 					pch = _("strong");
 				}
 
-				wprintf("PW: %s<br>\n", pch);
+				wc_printf("PW: %s<br>\n", pch);
 			}
 			if (a == 3)
-				wprintf("%s<br>\n", buf);
+				wc_printf("%s<br>\n", buf);
 			if (a == 4)
-				wprintf("%s<br>\n", buf);
+				wc_printf("%s<br>\n", buf);
 			if (a == 5)
-				wprintf("%s, ", buf);
+				wc_printf("%s, ", buf);
 			if (a == 6)
-				wprintf("%s ", buf);
+				wc_printf("%s ", buf);
 			if (a == 7)
-				wprintf("%s<br>\n", buf);
+				wc_printf("%s<br>\n", buf);
 			if (a == 8)
-				wprintf("%s<br>\n", buf);
+				wc_printf("%s<br>\n", buf);
 			if (a == 9)
-				wprintf(_("Current access level: %d (%s)\n"),
+				wc_printf(_("Current access level: %d (%s)\n"),
 					atoi(buf), axdefs[atoi(buf)]);
 		} while (strcmp(buf, "000"));
 	} else {
-		wprintf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
+		wc_printf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
 	}
 
-	wprintf("<hr />");
-	wprintf(_("Select access level for this user:"));
-	wprintf("<br />\n");
+	wc_printf("<hr />");
+	wc_printf(_("Select access level for this user:"));
+	wc_printf("<br />\n");
 	for (a = 0; a <= 6; ++a) {
-		wprintf("<a href=\"validate?nonce=%d?user=", WC->nonce);
+		wc_printf("<a href=\"validate?nonce=%d?user=", WC->nonce);
 		urlescputs(user);
-		wprintf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
+		wc_printf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
 			a, axdefs[a]);
 	}
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 
-	wprintf("</div>\n");
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</div>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
@@ -807,7 +807,7 @@ void display_changepw(void)
 	FreeStrBuf(&Buf);
 
 	if (!IsEmptyStr(WC->ImportantMessage)) {
-		wprintf("<span class=\"errormsg\">"
+		wc_printf("<span class=\"errormsg\">"
 			"%s</span><br />\n", WC->ImportantMessage);
 		safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
 	}
@@ -818,25 +818,25 @@ void display_changepw(void)
 		fmout("CENTER");
 	}
 
-	wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<table class=\"altern\" ");
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(_("Enter new password:"));
-	wprintf("</td><td>");
-	wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
-	wprintf("<tr class=\"odd\"><td>");
-	wprintf(_("Enter it again to confirm:"));
-	wprintf("</td><td>");
-	wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
-	wprintf("</table>\n");
-
-	wprintf("<div class=\"buttons\">\n");
-	wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
-	wprintf("</div>\n");
-	wprintf("</form>\n");
+	wc_printf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<table class=\"altern\" ");
+	wc_printf("<tr class=\"even\"><td>");
+	wc_printf(_("Enter new password:"));
+	wc_printf("</td><td>");
+	wc_printf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+	wc_printf("<tr class=\"odd\"><td>");
+	wc_printf(_("Enter it again to confirm:"));
+	wc_printf("</td><td>");
+	wc_printf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+	wc_printf("</table>\n");
+
+	wc_printf("<div class=\"buttons\">\n");
+	wc_printf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+	wc_printf("</div>\n");
+	wc_printf("</form>\n");
 
 	do_template("endbox", NULL);
 	wDumpContent(1);
diff --git a/webcit/autocompletion.c b/webcit/autocompletion.c
index 4d8b3799a..70b38dead 100644
--- a/webcit/autocompletion.c
+++ b/webcit/autocompletion.c
@@ -25,22 +25,22 @@ void recp_autocomplete(char *partial) {
 		PACKAGE_STRING);
 	begin_burst();
 
-	wprintf("<ul>");
+	wc_printf("<ul>");
 
 	serv_printf("AUTO %s", partial);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
 		while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			extract_token(name, buf, 0, '|', sizeof name);
-			wprintf("<li>");
+			wc_printf("<li>");
 			escputs(name);
-			wprintf("</li>");
+			wc_printf("</li>");
 		}
 	}
 
-	wprintf("</ul>");
+	wc_printf("</ul>");
 
-	wprintf("\r\n\r\n");
+	wc_printf("\r\n\r\n");
 	wDumpContent(0);
 }
 
diff --git a/webcit/calendar.c b/webcit/calendar.c
index 258d57b10..20949a2de 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -314,27 +314,27 @@ void respond_to_request(void)
 	serv_getln(buf, sizeof buf);
 
 	if (buf[0] == '2') {
-		wprintf("<img src=\"static/calarea_48x.gif\"><span>");
+		wc_printf("<img src=\"static/calarea_48x.gif\"><span>");
 		if (!strcasecmp(bstr("sc"), "accept")) {
-			wprintf(_("You have accepted this meeting invitation.  "
+			wc_printf(_("You have accepted this meeting invitation.  "
 				"It has been entered into your calendar.")
 			);
 		} else if (!strcasecmp(bstr("sc"), "tentative")) {
-			wprintf(_("You have tentatively accepted this meeting invitation.  "
+			wc_printf(_("You have tentatively accepted this meeting invitation.  "
 				"It has been 'pencilled in' to your calendar.")
 			);
 		} else if (!strcasecmp(bstr("sc"), "decline")) {
-			wprintf(_("You have declined this meeting invitation.  "
+			wc_printf(_("You have declined this meeting invitation.  "
 				  "It has <b>not</b> been entered into your calendar.")
 				);
 		}
-		wprintf(" ");
-		wprintf(_("A reply has been sent to the meeting organizer."));
-		wprintf("</span>");
+		wc_printf(" ");
+		wc_printf(_("A reply has been sent to the meeting organizer."));
+		wc_printf("</span>");
 	} else {
-		wprintf("<img align=\"center\" src=\"static/error.gif\"><span>");
-		wprintf("%s\n", &buf[4]);
-		wprintf("</span>");
+		wc_printf("<img align=\"center\" src=\"static/error.gif\"><span>");
+		wc_printf("%s\n", &buf[4]);
+		wc_printf("</span>");
 	}
 
 	end_ajax_response();
@@ -359,18 +359,18 @@ void handle_rsvp(void)
 	serv_getln(buf, sizeof buf);
 
 	if (buf[0] == '2') {
-		wprintf("<img src=\"static/calarea_48x.gif\"><span>");
+		wc_printf("<img src=\"static/calarea_48x.gif\"><span>");
 		if (!strcasecmp(bstr("sc"), "update")) {
-			wprintf(_("Your calendar has been updated to reflect this RSVP."));
+			wc_printf(_("Your calendar has been updated to reflect this RSVP."));
 		} else if (!strcasecmp(bstr("sc"), "ignore")) {
-			wprintf(_("You have chosen to ignore this RSVP. "
+			wc_printf(_("You have chosen to ignore this RSVP. "
 				  "Your calendar has <b>not</b> been updated.")
 				);
 		}
-		wprintf("</span>");
+		wc_printf("</span>");
 	} else {
-		wprintf("<img src=\"static/error.gif\"><span> %s\n", &buf[4]);
-		wprintf("</span>");
+		wc_printf("<img src=\"static/error.gif\"><span> %s\n", &buf[4]);
+		wc_printf("</span>");
 	}
 
 	end_ajax_response();
@@ -840,7 +840,7 @@ void do_freebusy(void)
 		hprintf("HTTP/1.1 404 %s\n", &buf[4]);
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf("%s\n", &buf[4]);
+		wc_printf("%s\n", &buf[4]);
 		end_burst();
 		return;
 	}
diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index b717cd2aa..e5ecf5d6d 100644
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -61,14 +61,14 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
 		localtime_r(&tt, &tm);
 	}
 
-	wprintf("<input type=\"text\" name=\"");
+	wc_printf("<input type=\"text\" name=\"");
 	StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
-	wprintf("\" id=\"");
+	wc_printf("\" id=\"");
 	StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
-	wprintf("\" size=\"10\" maxlength=\"10\" value=\"");
+	wc_printf("\" size=\"10\" maxlength=\"10\" value=\"");
 	wc_strftime(timebuf, 32, "%Y-%m-%d", &tm);
 	StrBufAppendBufPlain(WCC->WBuf, timebuf, -1, 0);
-	wprintf("\">");
+	wc_printf("\">");
 
 	StrBufAppendPrintf(WC->trailing_javascript, "attachDatePicker('");
 	StrBufAppendPrintf(WC->trailing_javascript, prefix);
@@ -78,46 +78,46 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
 	 * This keeps the data model consistent.
 	 */
 	if (date_only) {
-		wprintf("<div style=\"display:none\">");
+		wc_printf("<div style=\"display:none\">");
 	}
 
-	wprintf("<span ID=\"");
+	wc_printf("<span ID=\"");
 	StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
-	wprintf("_time\">");
-	wprintf(_("Hour: "));
-	wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
+	wc_printf("_time\">");
+	wc_printf(_("Hour: "));
+	wc_printf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
 	for (i=0; i<=23; ++i) {
 
 		if (time_format == WC_TIMEFORMAT_24) {
-			wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
+			wc_printf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
 				((tm.tm_hour == i) ? "SELECTED" : ""),
 				i, i
 				);
 		}
 		else {
-			wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
+			wc_printf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
 				((tm.tm_hour == i) ? "SELECTED" : ""),
 				i, hourname[i]
 				);
 		}
 
 	}
-	wprintf("</SELECT>\n");
+	wc_printf("</SELECT>\n");
 
-	wprintf(_("Minute: "));
-	wprintf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
+	wc_printf(_("Minute: "));
+	wc_printf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
 	for (i=0; i<=59; ++i) {
 		if ( (i % 5 == 0) || (tm.tm_min == i) ) {
-			wprintf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
+			wc_printf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
 				((tm.tm_min == i) ? "SELECTED" : ""),
 				i, i
 				);
 		}
 	}
-	wprintf("</SELECT></span>\n");
+	wc_printf("</SELECT></span>\n");
 
 	if (date_only) {
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 }
 
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index b97f4e276..2de090f33 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -61,15 +61,15 @@ void embeddable_mini_calendar(int year, int month)
 		localtime_r(&thetime, &tm);
 	}
 
-	wprintf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
+	wc_printf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
 
 	/* Previous month link */
 	localtime_r(&previous_month, &tm);
-	wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&laquo;</a>", 
+	wc_printf("<a href=\"javascript:minical_change_month(%d,%d);\">&laquo;</a>", 
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
 
 	wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
-	wprintf("&nbsp;&nbsp;"
+	wc_printf("&nbsp;&nbsp;"
 		"<span class=\"mini_calendar_month_label\">"
 		"%s %d"
 		"</span>"
@@ -77,20 +77,20 @@ void embeddable_mini_calendar(int year, int month)
 
 	/* Next month link */
 	localtime_r(&next_month, &tm);
-	wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&raquo;</a>",
+	wc_printf("<a href=\"javascript:minical_change_month(%d,%d);\">&raquo;</a>",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
 
-	wprintf("<table border=0 cellpadding=1 cellspacing=1 class=\"mini_calendar_days\">"
+	wc_printf("<table border=0 cellpadding=1 cellspacing=1 class=\"mini_calendar_days\">"
 		"<tr>");
 	colheader_time = thetime;
 	for (i=0; i<7; ++i) {
 		colheader_time = thetime + (i * 86400) ;
 		localtime_r(&colheader_time, &colheader_tm);
 		wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
-		wprintf("<th>%c</th>", colheader_label[0]);
+		wc_printf("<th>%c</th>", colheader_label[0]);
 
 	}
-	wprintf("</tr>\n");
+	wc_printf("</tr>\n");
 
 
         /* Now do 35 or 42 days */
@@ -101,21 +101,21 @@ void embeddable_mini_calendar(int year, int month)
 
 			/* Before displaying Sunday, start a new row */
 			if ((i % 7) == 0) {
-				wprintf("<tr>");
+				wc_printf("<tr>");
 			}
 
 			if (tm.tm_mon == month-1) {
 				snprintf(url, sizeof url, "readfwd?calview=day&year=%d&month=%d&day=%d", 
 					tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday);
-				wprintf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
+				wc_printf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
 			}
 			else {
-				wprintf("<td> </td>");
+				wc_printf("<td> </td>");
 			}
 
 			/* After displaying one week, end the row */
 			if ((i % 7) == 6) {
-				wprintf("</tr>\n");
+				wc_printf("</tr>\n");
 			}
 
 		}
@@ -123,7 +123,7 @@ void embeddable_mini_calendar(int year, int month)
 		thetime += (time_t)86400;		/* ahead 24 hours */
 	}
 
-	wprintf("</table>"			/* end of inner table */
+	wc_printf("</table>"			/* end of inner table */
 		"</div>\n");
 
 	StrBufAppendPrintf(WC->trailing_javascript,
@@ -174,7 +174,7 @@ void calendar_month_view_display_events(int year, int month, int day)
 	time_t tt;
 
 	if (GetCount(WCC->disp_cal_items) == 0) {
-		wprintf("<br /><br /><br />\n");
+		wc_printf("<br /><br /><br />\n");
 		return;
 	}
 
@@ -253,12 +253,12 @@ void calendar_month_view_display_events(int year, int month, int day)
 			if (p != NULL) {
 
 				if (all_day_event) {
-					wprintf("<table border=0 cellpadding=2><TR>"
+					wc_printf("<table border=0 cellpadding=2><TR>"
 						"<td bgcolor=\"#CCCCDD\">"
 						);
 				}
 
-				wprintf("<font size=\"-1\">"
+				wc_printf("<font size=\"-1\">"
 					"<a class=\"event%s\" href=\"display_edit_event?"
 					"msgnum=%ld?calview=month?year=%d?month=%d?day=%d\""
 					" btt_tooltext=\"",
@@ -267,18 +267,18 @@ void calendar_month_view_display_events(int year, int month, int day)
 					year, month, day
 					);
 
-				wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
-				wprintf("<i>%s</i> ",          _("Summary:"));
+				wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+				wc_printf("<i>%s</i> ",          _("Summary:"));
 				escputs((char *)icalproperty_get_comment(p));
-				wprintf("<br />");
+				wc_printf("<br />");
 				
 				q = icalcomponent_get_first_property(
 					Cal->cal,
 					ICAL_LOCATION_PROPERTY);
 				if (q) {
-					wprintf("<i>%s</i> ", _("Location:"));
+					wc_printf("<i>%s</i> ", _("Location:"));
 					escputs((char *)icalproperty_get_comment(q));
-					wprintf("<br />");
+					wc_printf("<br />");
 				}
 				
 				/*
@@ -320,17 +320,17 @@ void calendar_month_view_display_events(int year, int month, int day)
 							wc_strftime(buf, sizeof buf, "%x", &d_tm);
 
 							if (no_end || !icaltime_compare(t, end_t)) {
-								wprintf("<i>%s</i> %s<br>",
+								wc_printf("<i>%s</i> %s<br>",
 									_("Date:"), buf);
 							}
 							else {
-								wprintf("<i>%s</i> %s<br>",
+								wc_printf("<i>%s</i> %s<br>",
 									_("Starting date:"), buf);
 								d_tm.tm_year = end_t.year - 1900;
 								d_tm.tm_mon = end_t.month - 1;
 								d_tm.tm_mday = end_t.day;
 								wc_strftime(buf, sizeof buf, "%x", &d_tm);
-								wprintf("<i>%s</i> %s<br>",
+								wc_printf("<i>%s</i> %s<br>",
 									_("Ending date:"), buf);
 							}
 						}
@@ -338,15 +338,15 @@ void calendar_month_view_display_events(int year, int month, int day)
 							tt = icaltime_as_timet(t);
 							webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
 							if (no_end || !icaltime_compare(t, end_t)) {
-								wprintf("<i>%s</i> %s<br>",
+								wc_printf("<i>%s</i> %s<br>",
 									_("Date/time:"), buf);
 							}
 							else {
-								wprintf("<i>%s</i> %s<br>",
+								wc_printf("<i>%s</i> %s<br>",
 									_("Starting date/time:"), buf);
 								tt = icaltime_as_timet(end_t);
 								webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
-								wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+								wc_printf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
 							}
 							
 						}
@@ -356,18 +356,18 @@ void calendar_month_view_display_events(int year, int month, int day)
 				
 				q = icalcomponent_get_first_property(Cal->cal, ICAL_DESCRIPTION_PROPERTY);
 				if (q) {
-					wprintf("<i>%s</i> ", _("Notes:"));
+					wc_printf("<i>%s</i> ", _("Notes:"));
 					escputs((char *)icalproperty_get_comment(q));
-					wprintf("<br />");
+					wc_printf("<br />");
 				}
 				
-				wprintf("\">");
+				wc_printf("\">");
 				escputs((char *)
 					icalproperty_get_comment(p));
-				wprintf("</a></font><br />\n");
+				wc_printf("</a></font><br />\n");
 				
 				if (all_day_event) {
-					wprintf("</td></tr></table>");
+					wc_printf("</td></tr></table>");
 				}
 				
 			}
@@ -459,7 +459,7 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
 				difftime=(event_tte-event_tts)/60;
 				hours=(int)(difftime / 60);
 				minutes=difftime % 60;
-				wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
+				wc_printf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
 					"<font size=\"-1\">"
 					"<a class=\"event%s\" href=\"display_edit_event?msgnum=%ld?calview=calbrief?year=%s?month=%s?day=%s\">",
 					daycolor,
@@ -478,7 +478,7 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
 				wc_strftime(&sbuf[0], sizeof(sbuf), timeformat, &event_tms);
 				wc_strftime(&ebuf[0], sizeof(sbuf), timeformat, &event_tme);
 				
-				wprintf("</a></font></td>"
+				wc_printf("</a></font></td>"
 					"<td bgcolor='%s'>%s</td><td bgcolor='%s'>%s</td></tr>",
 					daycolor,
 					sbuf,
@@ -544,46 +544,46 @@ void calendar_month_view(int year, int month, int day) {
 	}
 
 	/* Outer table (to get the background color) */
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"calendar\"> \n <tr><td>"); 
 
-	wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
+	wc_printf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
 
-	wprintf("<td align=center>");
+	wc_printf("<td align=center>");
 
 	localtime_r(&previous_month, &tm);
-	wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
+	wc_printf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
 
 	wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
-	wprintf("&nbsp;&nbsp;"
+	wc_printf("&nbsp;&nbsp;"
 		"<font size=+1 color=\"#FFFFFF\">"
 		"%s %d"
 		"</font>"
 		"&nbsp;&nbsp;", colheader_label, year);
 
 	localtime_r(&next_month, &tm);
-	wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
+	wc_printf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
 	/* Inner table (the real one) */
-	wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
+	wc_printf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
 		"bgcolor=#204B78 id=\"inner_month\"><tr>");
-	wprintf("<th align=center width=2%%></th>");
+	wc_printf("<th align=center width=2%%></th>");
 	colheader_time = thetime;
 	for (i=0; i<7; ++i) {
 		colheader_time = thetime + (i * 86400) ;
 		localtime_r(&colheader_time, &colheader_tm);
 		wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
-		wprintf("<th align=center width=14%%>"
+		wc_printf("<th align=center width=14%%>"
 			"<font color=\"#FFFFFF\">%s</font></th>", colheader_label);
 
 	}
-	wprintf("</tr>\n");
+	wc_printf("</tr>\n");
 
 
         /* Now do 35 or 42 days */
@@ -592,12 +592,12 @@ void calendar_month_view(int year, int month, int day) {
 
 		/* Before displaying the first day of the week, start a new row */
 		if ((i % 7) == 0) {
-			wprintf("<tr><td class=\"week_of_year\">");
+			wc_printf("<tr><td class=\"week_of_year\">");
 			wc_strftime(colheader_label, sizeof colheader_label, "%V", &tm);
-                        wprintf("%s ", colheader_label);
+                        wc_printf("%s ", colheader_label);
 		}
 
-		wprintf("<td class=\"cal%s\"><div class=\"day\">",
+		wc_printf("<td class=\"cal%s\"><div class=\"day\">",
 			((tm.tm_mon != month-1) ? "out" :
 				((tm.tm_mday == day) ? "today" :
 				((tm.tm_wday==0 || tm.tm_wday==6) ? "weekend" :
@@ -605,9 +605,9 @@ void calendar_month_view(int year, int month, int day) {
 			);
 		if ((i==0) || (tm.tm_mday == 1)) {
 			wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
-			wprintf("%s ", colheader_label);
+			wc_printf("%s ", colheader_label);
 		}
-		wprintf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">"
+		wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">"
 			"%d</a></div>",
 			tm.tm_year + 1900,
 			tm.tm_mon + 1,
@@ -621,11 +621,11 @@ void calendar_month_view(int year, int month, int day) {
 			tm.tm_mday
 			);
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
 		/* After displaying the last day of the week, end the row */
 		if ((i % 7) == 6) {
-			wprintf("</tr>\n");
+			wc_printf("</tr>\n");
 		}
 
 		thetime += (time_t)86400;		/* ahead 24 hours */
@@ -636,7 +636,7 @@ void calendar_month_view(int year, int month, int day) {
 		}
 	}
 
-	wprintf("</table>"			/* end of inner table */
+	wc_printf("</table>"			/* end of inner table */
 		"</td></tr></table>"		/* end of outer table */
 		"</div>\n");
 
@@ -695,38 +695,38 @@ void calendar_brief_month_view(int year, int month, int day) {
 	}
 
 	/* Outer table (to get the background color) */
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table width=100%% border=0 cellpadding=0 cellspacing=0 "
 		"bgcolor=#204B78><TR><TD>\n");
 
-	wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
+	wc_printf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
 
-	wprintf("<td align=center>");
+	wc_printf("<td align=center>");
 
 	localtime_r(&previous_month, &tm);
-	wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
+	wc_printf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
 
 	wc_strftime(month_label, sizeof month_label, "%B", &tm);
-	wprintf("&nbsp;&nbsp;"
+	wc_printf("&nbsp;&nbsp;"
 		"<font size=+1 color=\"#FFFFFF\">"
 		"%s %d"
 		"</font>"
 		"&nbsp;&nbsp;", month_label, year);
 
 	localtime_r(&next_month, &tm);
-	wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
+	wc_printf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
 	/* Inner table (the real one) */
-	wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
+	wc_printf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
 		"bgcolor=#EEEECC><TR>");
-	wprintf("</tr>\n");
-	wprintf("<tr><td colspan=\"100%%\">\n");
+	wc_printf("</tr>\n");
+	wc_printf("<tr><td colspan=\"100%%\">\n");
 
 	/* Now do 35 days */
 	for (i = 0; i < 35; ++i) {
@@ -739,7 +739,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 		/* Before displaying Sunday, start a new CELL */
 		if ((i % 7) == 0) {
 			wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm);
-			wprintf("<table border='0' bgcolor=\"#EEEECC\" width='100%%'> <tr><th colspan='4'>%s %s</th></tr>"
+			wc_printf("<table border='0' bgcolor=\"#EEEECC\" width='100%%'> <tr><th colspan='4'>%s %s</th></tr>"
 				"   <tr><td>%s</td><td width=70%%>%s</td><td>%s</td><td>%s</td></tr>\n",
 				_("Week"), 
 				weeknumber,
@@ -756,7 +756,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 		
 		/* Day Header */
 		wc_strftime(weekday_name, sizeof weekday_name, "%A", &tm);
-		wprintf("<tr><td bgcolor='%s' colspan='1' align='left'> %s,%i."
+		wc_printf("<tr><td bgcolor='%s' colspan='1' align='left'> %s,%i."
 			"</td><td bgcolor='%s' colspan='3'><hr></td></tr>\n",
 			daycolor,
 			weekday_name,tm.tm_mday,
@@ -768,13 +768,13 @@ void calendar_brief_month_view(int year, int month, int day) {
 
 		/* After displaying Saturday, end the row */
 		if ((i % 7) == 6) {
-			wprintf("</td></tr></table>\n");
+			wc_printf("</td></tr></table>\n");
 		}
 
 		thetime += (time_t)86400;		/* ahead 24 hours */
 	}
 
-	wprintf("</table>"			/* end of inner table */
+	wc_printf("</table>"			/* end of inner table */
 		"</td></tr></table>"		/* end of outer table */
 		"</div>\n");
 }
@@ -783,7 +783,7 @@ void calendar_brief_month_view(int year, int month, int day) {
  * Calendar week view -- not implemented yet, this is a stub function
  */
 void calendar_week_view(int year, int month, int day) {
-	wprintf("<center><i>week view FIXME</i></center><br />\n");
+	wc_printf("<center><i>week view FIXME</i></center><br />\n");
 }
 
 
@@ -932,81 +932,81 @@ void calendar_day_view_display_events(time_t thetime,
 
 			if (all_day_event && notime_events)
 			{
-				wprintf("<li class=\"event_framed%s\"> "
+				wc_printf("<li class=\"event_framed%s\"> "
 					"<a href=\"display_edit_event?"
 					"msgnum=%ld?calview=day?year=%d?month=%d?day=%d\" "
 					" class=\"event_title\" "
 					" btt_tooltext=\"",
 					(Cal->unread)?"_unread":"_read",
                                         Cal->cal_msgnum, year, month, day);
-                                wprintf("<i>%s</i><br />",      _("All day event"));
-				wprintf("<i>%s: %s</i><br />",  _("From"), Cal->from);
-                                wprintf("<i>%s</i> ",           _("Summary:"));
+                                wc_printf("<i>%s</i><br />",      _("All day event"));
+				wc_printf("<i>%s: %s</i><br />",  _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",           _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("<br />");
+                                wc_printf("<br />");
 				q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br />");
 				}
 				if (!icaltime_compare(t, end_t)) { /* one day only */
 					webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
-					wprintf("<i>%s</i> %s<br>", _("Date:"), buf);
+					wc_printf("<i>%s</i> %s<br>", _("Date:"), buf);
 				}
 				else {
 					webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
-					wprintf("<i>%s</i> %s<br>", _("Starting date:"), buf);
+					wc_printf("<i>%s</i> %s<br>", _("Starting date:"), buf);
 					webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE);
-					wprintf("<i>%s</i> %s<br>", _("Ending date:"), buf);
+					wc_printf("<i>%s</i> %s<br>", _("Ending date:"), buf);
 				}
 				q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Notes:"));
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br />");
                                 }
-                                wprintf("\">");
+                                wc_printf("\">");
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("</a> <span>(");
-                                wprintf(_("All day event"));
-                                wprintf(")</span></li>\n");
+                                wc_printf("</a> <span>(");
+                                wc_printf(_("All day event"));
+                                wc_printf(")</span></li>\n");
 			}
 			else if (ongoing_event && notime_events) 
 			{
-				wprintf("<li class=\"event_framed%s\"> "
+				wc_printf("<li class=\"event_framed%s\"> "
 					"<a href=\"display_edit_event?"
 					"msgnum=%ld&calview=day?year=%d?month=%d?day=%d\" "
 					" class=\"event_title\" " 
 					"btt_tooltext=\"",
 					(Cal->unread)?"_unread":"_read",
 					Cal->cal_msgnum, year, month, day);
-                                wprintf("<i>%s</i><br />",     _("Ongoing event"));
-				wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
-                                wprintf("<i>%s</i> ",          _("Summary:"));
+                                wc_printf("<i>%s</i><br />",     _("Ongoing event"));
+				wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("<br />");
+                                wc_printf("<br />");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br />");
 								}
                                 webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
-                                wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
                                 webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
-                                wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                                wc_printf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Notes:"));
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br />");
                                 }
-                                wprintf("\">");
+                                wc_printf("\">");
 				escputs((char *) icalproperty_get_comment(p));
-				wprintf("</a> <span>(");
-				wprintf(_("Ongoing event"));
-				wprintf(")</span></li>\n");
+				wc_printf("</a> <span>(");
+				wc_printf(_("Ongoing event"));
+				wc_printf(")</span></li>\n");
 			}
 			else if (!all_day_event && !notime_events)
 			{
@@ -1049,48 +1049,48 @@ void calendar_day_view_display_events(time_t thetime,
 					/* should never get here */
 				}
 
-				wprintf("<dd  class=\"event_framed%s\" "
+				wc_printf("<dd  class=\"event_framed%s\" "
 					"style=\"position: absolute; "
 					"top:%dpx; left:%dpx; "
 					"height:%dpx; \" >",
 					(Cal->unread)?"_unread":"_read",
 					top, (gap * 40), (bottom-top)
 					);
-				wprintf("<a href=\"display_edit_event?"
+				wc_printf("<a href=\"display_edit_event?"
 					"msgnum=%ld?calview=day?year=%d?month=%d?day=%d?hour=%d\" "
 					"class=\"event_title\" "
                                		"btt_tooltext=\"",
 					Cal->cal_msgnum, year, month, day, t.hour);
-				wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
-                                wprintf("<i>%s</i> ",          _("Summary:"));
+				wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("<br />");
+                                wc_printf("<br />");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br />");
 								}
 				if (!icaltime_compare(t, end_t)) { /* one day only */
 					webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
-					wprintf("<i>%s</i> %s<br>", _("Date/time:"), buf);
+					wc_printf("<i>%s</i> %s<br>", _("Date/time:"), buf);
 				}
 				else {
 					webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
-					wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+					wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
 					webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
-					wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+					wc_printf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
 				}
 				q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Notes:"));
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br />");
                                 }
-                                wprintf("\">");
+                                wc_printf("\">");
 
 				escputs((char *) icalproperty_get_comment(p));
-				wprintf("</a></dd>\n");
+				wc_printf("</a></dd>\n");
 			}
 		}
 	}
@@ -1148,14 +1148,14 @@ void calendar_day_view(int year, int month, int day) {
 	++tomorrow.day;
 	tomorrow = icaltime_normalize(tomorrow);
 
-	wprintf("<div class=\"fix_scrollbar_bug\">");
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
 
 	/* Inner table (the real one) */
-	wprintf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
+	wc_printf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
 
 	/* Innermost cell (contains hours etc.) */
-	wprintf("<td class=\"events_of_the_day\" >");
-       	wprintf("<dl class=\"events\" >");
+	wc_printf("<td class=\"events_of_the_day\" >");
+       	wc_printf("<dl class=\"events\" >");
 
 	/* Now the middle of the day... */
 
@@ -1164,7 +1164,7 @@ void calendar_day_view(int year, int month, int day) {
 	if (hourlabel > (timeline - 2)) hourlabel = timeline - 2;
 
 	for (hour = 0; hour < daystart; ++hour) {	/* could do HEIGHT=xx */
-		wprintf("<dt class=\"extrahour\" 	"
+		wc_printf("<dt class=\"extrahour\" 	"
 			"style=\"		"
 			"position: absolute; 	"
 			"top: %dpx; left: 0px; 	"
@@ -1180,22 +1180,22 @@ void calendar_day_view(int year, int month, int day) {
 			);
 
 		if (time_format == WC_TIMEFORMAT_24) {
-			wprintf("%2d:00</a> ", hour);
+			wc_printf("%2d:00</a> ", hour);
 		}
 		else {
-			wprintf("%d:00%s</a> ",
+			wc_printf("%d:00%s</a> ",
 				((hour == 0) ? 12 : (hour <= 12 ? hour : hour-12)),
 				(hour < 12 ? "am" : "pm")
 				);
 		}
 
-		wprintf("</dt>");
+		wc_printf("</dt>");
 	}
 
 	gap = daystart * extratimeline;
 
         for (hour = daystart; hour <= dayend; ++hour) {       /* could do HEIGHT=xx */
-                wprintf("<dt class=\"hour\"     "
+                wc_printf("<dt class=\"hour\"     "
                         "style=\"               "
                         "position: absolute;    "
                         "top: %ldpx; left: 0px; "
@@ -1211,22 +1211,22 @@ void calendar_day_view(int year, int month, int day) {
 			);
 
                 if (time_format == WC_TIMEFORMAT_24) {
-                        wprintf("%2d:00</a> ", hour);
+                        wc_printf("%2d:00</a> ", hour);
                 }
                 else {
-                        wprintf("%d:00%s</a> ",
+                        wc_printf("%d:00%s</a> ",
                                 (hour <= 12 ? hour : hour-12),
                                 (hour < 12 ? "am" : "pm")
 						);
                 }
 
-                wprintf("</dt>");
+                wc_printf("</dt>");
         }
 
 	gap = gap + ((dayend - daystart + 1) * timeline);
 
         for (hour = (dayend + 1); hour < 24; ++hour) {       /* could do HEIGHT=xx */
-                wprintf("<dt class=\"extrahour\"     "
+                wc_printf("<dt class=\"extrahour\"     "
                         "style=\"               "
                         "position: absolute;    "
                         "top: %ldpx; left: 0px; "
@@ -1242,49 +1242,49 @@ void calendar_day_view(int year, int month, int day) {
                 );
 
                 if (time_format == WC_TIMEFORMAT_24) {
-                        wprintf("%2d:00</a> ", hour);
+                        wc_printf("%2d:00</a> ", hour);
                 }
                 else {
-                        wprintf("%d:00%s</a> ",
+                        wc_printf("%d:00%s</a> ",
                                 (hour <= 12 ? hour : hour-12),
                                 (hour < 12 ? "am" : "pm")
                         );
                 }
 
-                wprintf("</dt>");
+                wc_printf("</dt>");
         }
 
 	/* Display events with start and end times on this day */
 	calendar_day_view_display_events(today_t, year, month, day, 0, daystart, dayend);
 
-       	wprintf("</dl>");
-	wprintf("</td>");			/* end of innermost table */
+       	wc_printf("</dl>");
+	wc_printf("</td>");			/* end of innermost table */
 
 	/* Display extra events (start/end times not present or not today) in the middle column */
-        wprintf("<td class=\"extra_events\">");
+        wc_printf("<td class=\"extra_events\">");
 
-        wprintf("<ul>");
+        wc_printf("<ul>");
 
         /* Display all-day events */
 	calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend);
 
-        wprintf("</ul>");
+        wc_printf("</ul>");
 
-	wprintf("</td>");	/* end extra on the middle */
+	wc_printf("</td>");	/* end extra on the middle */
 
-	wprintf("<td width=20%% align=center valign=top>");	/* begin stuff-on-the-right */
+	wc_printf("<td width=20%% align=center valign=top>");	/* begin stuff-on-the-right */
 
 	/* Begin todays-date-with-left-and-right-arrows */
-	wprintf("<table border=0 width=100%% "
+	wc_printf("<table border=0 width=100%% "
 		"cellspacing=0 cellpadding=0 bgcolor=\"#FFFFFF\">\n");
-	wprintf("<tr>");
+	wc_printf("<tr>");
 
 	/* Left arrow */	
-	wprintf("<td align=center>");
-	wprintf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
+	wc_printf("<td align=center>");
+	wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
 		yesterday.year, yesterday.month, yesterday.day);
-	wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>");
-	wprintf("</td>");
+	wc_printf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>");
+	wc_printf("</td>");
 
 	wc_strftime(d_str, sizeof d_str,
 		"<td align=center>"
@@ -1295,28 +1295,28 @@ void calendar_day_view(int year, int month, int day) {
 		"</td>",
 		&d_tm
 		);
-	wprintf("%s", d_str);
+	wc_printf("%s", d_str);
 
 	/* Right arrow */
-	wprintf("<td align=center>");
-	wprintf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
+	wc_printf("<td align=center>");
+	wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
 		tomorrow.year, tomorrow.month, tomorrow.day);
-	wprintf("<img align=middle src=\"static/nextdate_32x.gif\""
+	wc_printf("<img align=middle src=\"static/nextdate_32x.gif\""
 		" border=0></a>\n");
-	wprintf("</td>");
+	wc_printf("</td>");
 
-	wprintf("</tr></table>\n");
+	wc_printf("</tr></table>\n");
 	/* End todays-date-with-left-and-right-arrows */
 
 	/* Embed a mini month calendar in this space */
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 	embeddable_mini_calendar(year, month);
 
-	wprintf("</font></center>\n");
+	wc_printf("</font></center>\n");
 
-	wprintf("</td></tr>");			/* end stuff-on-the-right */
+	wc_printf("</td></tr>");			/* end stuff-on-the-right */
 
-	wprintf("</table>"			/* end of inner table */
+	wc_printf("</table>"			/* end of inner table */
 		"</div>");
 
 	StrBufAppendPrintf(WC->trailing_javascript,
@@ -1388,17 +1388,17 @@ int calendar_summary_view(void) {
 
 
 					if (WCC->wc_view == VIEW_TASKS) {
-						wprintf("<a href=\"display_edit_task"
+						wc_printf("<a href=\"display_edit_task"
 							"?msgnum=%ld"
 							"?return_to_summary=1"
 							"?gotofirst=",
 							Cal->cal_msgnum
 						);
 						escputs(ChrPtr(WCC->wc_roomname));
-						wprintf("\">");
+						wc_printf("\">");
 					}
 					else {
-						wprintf("<a href=\"display_edit_event"
+						wc_printf("<a href=\"display_edit_event"
 							"?msgnum=%ld"
 							"?calview=summary"
 							"?year=%d"
@@ -1411,13 +1411,13 @@ int calendar_summary_view(void) {
 							today_tm.tm_mday
 						);
 						escputs(ChrPtr(WCC->wc_roomname));
-						wprintf("\">");
+						wc_printf("\">");
 					}
 					escputs((char *) icalproperty_get_comment(p));
 					if (!all_day_event) {
-						wprintf(" (%s)", timestring);
+						wc_printf(" (%s)", timestring);
 					}
-					wprintf("</a><br />\n");
+					wc_printf("</a><br />\n");
 					++num_displayed;
 				}
 			}
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 48fc3f8ae..4c322eb7c 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -248,7 +248,7 @@ void do_404(void)
 {
 	hprintf("HTTP/1.1 404 Not found\r\n");
 	hprintf("Content-Type: text/plain\r\n");
-	wprintf("Not found\r\n");
+	wc_printf("Not found\r\n");
 	end_burst();
 }
 
diff --git a/webcit/downloads.c b/webcit/downloads.c
index 56134d0c8..3bd86350e 100644
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -268,7 +268,7 @@ void download_file(void)
 		hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf(_("An error occurred while retrieving this file: %s\n"), 
+		wc_printf(_("An error occurred while retrieving this file: %s\n"), 
 			ChrPtr(Buf));
 		end_burst();
 	}
diff --git a/webcit/event.c b/webcit/event.c
index 65036f038..7433e5312 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -149,39 +149,39 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
 	/* Begin output */
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Add or edit an event"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
+	wc_printf(_("Add or edit an event"));
+	wc_printf("</h1>");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">");
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
 
 	/************************************************************
 	 * Uncomment this to see the UID in calendar events for debugging
-	wprintf("UID == ");
+	wc_printf("UID == ");
 	p = icalcomponent_get_first_property(vevent, ICAL_UID_PROPERTY);
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("<br />\n");
-	wprintf("SEQUENCE == %d<br />\n", sequence);
+	wc_printf("<br />\n");
+	wc_printf("SEQUENCE == %d<br />\n", sequence);
 	*************************************************************/
 
-	wprintf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
 		msgnum);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
 		bstr("calview"));
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"year\" VALUE=\"%s\">\n",
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"year\" VALUE=\"%s\">\n",
 		bstr("year"));
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"month\" VALUE=\"%s\">\n",
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"month\" VALUE=\"%s\">\n",
 		bstr("month"));
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
 		bstr("day"));
 
 
@@ -189,33 +189,33 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	begin_tab(0, 3);
 
 	/* Put it in a borderless table so it lines up nicely */
-	wprintf("<TABLE border=0 width=100%%>\n");
+	wc_printf("<TABLE border=0 width=100%%>\n");
 
-	wprintf("<TR><TD><B>");
-	wprintf(_("Summary"));
-	wprintf("</B></TD><TD>\n"
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Summary"));
+	wc_printf("</B></TD><TD>\n"
 		"<INPUT TYPE=\"text\" NAME=\"summary\" "
 		"MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
 	p = icalcomponent_get_first_property(vevent, ICAL_SUMMARY_PROPERTY);
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("\"></TD></TR>\n");
+	wc_printf("\"></TD></TR>\n");
 
-	wprintf("<TR><TD><B>");
-	wprintf(_("Location"));
-	wprintf("</B></TD><TD>\n"
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Location"));
+	wc_printf("</B></TD><TD>\n"
 		"<INPUT TYPE=\"text\" NAME=\"location\" "
 		"MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
 	p = icalcomponent_get_first_property(vevent, ICAL_LOCATION_PROPERTY);
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("\"></TD></TR>\n");
+	wc_printf("\"></TD></TR>\n");
 
-	wprintf("<TR><TD><B>");
-	wprintf(_("Start"));
-	wprintf("</B></TD><TD>\n");
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Start"));
+	wc_printf("</B></TD><TD>\n");
 	p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
 	if (p != NULL) {
 		t_start = icalproperty_get_dtstart(p);
@@ -253,18 +253,18 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	}
 	display_icaltimetype_as_webform(&t_start, "dtstart", 0);
 
-	wprintf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
+	wc_printf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
 		"VALUE=\"yes\" onclick=\"eventEditAllDay();\""
 		" %s >%s",
 		(t_start.is_date ? "CHECKED=\"CHECKED\"" : "" ),
 		_("All day event")
 	);
 
-	wprintf("</TD></TR>\n");
+	wc_printf("</TD></TR>\n");
 
-	wprintf("<TR><TD><B>");
-	wprintf(_("End"));
-	wprintf("</B></TD><TD id=\"dtendcell\">\n");
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("End"));
+	wc_printf("</B></TD><TD id=\"dtendcell\">\n");
 	p = icalcomponent_get_first_property(vevent,
 						ICAL_DTEND_PROPERTY);
 	if (p != NULL) {
@@ -310,11 +310,11 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		}
 	}
 	display_icaltimetype_as_webform(&t_end, "dtend", 0);
-	wprintf("</TD></TR>\n");
+	wc_printf("</TD></TR>\n");
 
-	wprintf("<TR><TD><B>");
-	wprintf(_("Notes"));
-	wprintf("</B></TD><TD>\n"
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Notes"));
+	wc_printf("</B></TD><TD>\n"
 		"<TEXTAREA NAME=\"description\" wrap=soft "
 		"ROWS=5 COLS=72 WIDTH=72>\n"
 	);
@@ -322,7 +322,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("</TEXTAREA></TD></TR>");
+	wc_printf("</TEXTAREA></TD></TR>");
 
 	/*
 	 * For a new event, the user creating the event should be the
@@ -354,14 +354,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		}
 	}
 
-	wprintf("<TR><TD><B>");
-	wprintf(_("Organizer"));
-	wprintf("</B></TD><TD>");
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Organizer"));
+	wc_printf("</B></TD><TD>");
 	escputs(organizer_string);
 	if (organizer_is_me) {
-		wprintf(" <FONT SIZE=-1><I>");
-		wprintf(_("(you are the organizer)"));
-		wprintf("</I></FONT>\n");
+		wc_printf(" <FONT SIZE=-1><I>");
+		wc_printf(_("(you are the organizer)"));
+		wc_printf("</I></FONT>\n");
 	}
 
 	/*
@@ -370,16 +370,16 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	 * especially if this is a new event and there is no organizer already
 	 * in the calendar object.
 	 */
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"organizer\" VALUE=\"");
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"organizer\" VALUE=\"");
 	escputs(organizer_string);
-	wprintf("\">");
+	wc_printf("\">");
 
-	wprintf("</TD></TR>\n");
+	wc_printf("</TD></TR>\n");
 
 	/* Transparency */
-	wprintf("<TR><TD><B>");
-	wprintf(_("Show time as:"));
-	wprintf("</B></TD><TD>");
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Show time as:"));
+	wc_printf("</B></TD><TD>");
 
 	p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
 	if (p == NULL) {
@@ -396,41 +396,41 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		v = NULL;
 	}
 
-	wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
+	wc_printf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
 	if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)) {
-		wprintf(" CHECKED");
+		wc_printf(" CHECKED");
 	}
-	wprintf(">");
-	wprintf(_("Free"));
-	wprintf("&nbsp;&nbsp;");
+	wc_printf(">");
+	wc_printf(_("Free"));
+	wc_printf("&nbsp;&nbsp;");
 
-	wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
+	wc_printf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
 	if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)) {
-		wprintf(" CHECKED");
+		wc_printf(" CHECKED");
 	}
-	wprintf(">");
-	wprintf(_("Busy"));
+	wc_printf(">");
+	wc_printf(_("Busy"));
 
-	wprintf("</TD></TR>\n");
+	wc_printf("</TD></TR>\n");
 
 
 	/* Done with properties. */
-	wprintf("</TABLE>\n");
+	wc_printf("</TABLE>\n");
 
 	end_tab(0, 3);
 
 	/* Attendees tab (need to move things here) */
 	begin_tab(1, 3);
-	wprintf("<TABLE border=0 width=100%%>\n");	/* same table style as the event tab */
-	wprintf("<TR><TD><B>");
-	wprintf(_("Attendees"));
-	wprintf("</B><br />"
+	wc_printf("<TABLE border=0 width=100%%>\n");	/* same table style as the event tab */
+	wc_printf("<TR><TD><B>");
+	wc_printf(_("Attendees"));
+	wc_printf("</B><br />"
 		"<font size=-2>");
-	wprintf(_("(One per line)"));
-	wprintf("</font>\n");
+	wc_printf(_("(One per line)"));
+	wc_printf("</font>\n");
 
 	/* Pop open an address book -- begin */
-	wprintf(
+	wc_printf(
 		"&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
 		"title=\"%s\">"
 		"<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
@@ -440,7 +440,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	);
 	/* Pop open an address book -- end */
 
-	wprintf("</TD><TD>"
+	wc_printf("</TD><TD>"
 		"<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
 		"onchange=\"EnableOrDisableCheckButton();\" "
 		"onKeyPress=\"EnableOrDisableCheckButton();\" "
@@ -457,17 +457,17 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 			/* screen name or email address */
 			strcpy(attendee_string, &attendee_string[7]);
 			striplt(attendee_string);
-			if (i++) wprintf("\n");
+			if (i++) wc_printf("\n");
 			escputs(attendee_string);
-			wprintf(" ");
+			wc_printf(" ");
 
 			/* participant status */
 			partstat_as_string(buf, attendee);
 			escputs(buf);
 		}
 	}
-	wprintf("</TEXTAREA></TD></TR>\n");
-	wprintf("</TABLE>\n");
+	wc_printf("</TEXTAREA></TD></TR>\n");
+	wc_printf("</TABLE>\n");
 	end_tab(1, 3);
 
 	/* Recurrence tab */
@@ -486,7 +486,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		recur.freq = ICAL_WEEKLY_RECURRENCE;
 	}
 
-	wprintf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
+	wc_printf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
 		"VALUE=\"yes\" "
 		"onclick=\"RecurrenceShowHide();\""
 		" %s >%s",
@@ -494,34 +494,34 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		_("This is a recurring event")
 	);
 
-	wprintf("<div id=\"rrule_div\">\n");		/* begin 'rrule_div' div */
+	wc_printf("<div id=\"rrule_div\">\n");		/* begin 'rrule_div' div */
 
-	wprintf("<table border=0 cellspacing=\"10\" width=100%%>\n");
+	wc_printf("<table border=0 cellspacing=\"10\" width=100%%>\n");
 
-	wprintf("<tr><td><b>");
-	wprintf(_("Recurrence rule"));
-	wprintf("</b></td><td>");
+	wc_printf("<tr><td><b>");
+	wc_printf(_("Recurrence rule"));
+	wc_printf("</b></td><td>");
 
 	if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
-	wprintf("%s ", _("Repeats every"));
+	wc_printf("%s ", _("Repeats every"));
 
-	wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
-	wprintf("value=\"%d\">&nbsp;", recur.interval);
+	wc_printf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
+	wc_printf("value=\"%d\">&nbsp;", recur.interval);
 
-	wprintf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
+	wc_printf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
 		"onChange=\"RecurrenceShowHide();\">\n");
 	for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
-		wprintf("<option %s%svalue=\"%d\">%s</option>\n",
+		wc_printf("<option %s%svalue=\"%d\">%s</option>\n",
 			((i == recur.freq) ? "selected " : ""),
 			(((i == recur.freq) || ((i>=3)&&(i<=6))) ? "" : "disabled "),
 			i,
 			frequency_units[i]
 		);
 	}
-	wprintf("</select>\n");
+	wc_printf("</select>\n");
 
-	wprintf("<div id=\"weekday_selector\">");	/* begin 'weekday_selector' div */
-	wprintf("%s<br>", _("on these weekdays:"));
+	wc_printf("<div id=\"weekday_selector\">");	/* begin 'weekday_selector' div */
+	wc_printf("%s<br>", _("on these weekdays:"));
 
 	memset(weekday_is_selected, 0, 7);
 
@@ -540,19 +540,19 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
 	for (j=0; j<7; ++j) {
 		i = ((j + (int)weekstart) % 7);
-		wprintf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
-		if (weekday_is_selected[i]) wprintf(" checked");
-		wprintf(">%s\n", weekday_labels[i]);
+		wc_printf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
+		if (weekday_is_selected[i]) wc_printf(" checked");
+		wc_printf(">%s\n", weekday_labels[i]);
 	}
-	wprintf("</div>\n");				/* end 'weekday_selector' div */
+	wc_printf("</div>\n");				/* end 'weekday_selector' div */
 
 
 
 
 
-	wprintf("<div id=\"monthday_selector\">");	/* begin 'monthday_selector' div */
+	wc_printf("<div id=\"monthday_selector\">");	/* begin 'monthday_selector' div */
 
-	wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
+	wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
 		"value=\"rrmonthtype_mday\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rrmonthtype_is_preselected == 0) ? "checked" : "")
@@ -579,42 +579,42 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		rrmweekday = icalrecurrencetype_day_day_of_week(recur.by_day[0]) - 1;
 	}
 
-	wprintf(_("on day %s%d%s of the month"), "<span id=\"rrmday\">", rrmday, "</span>");
-	wprintf("<br />\n");
+	wc_printf(_("on day %s%d%s of the month"), "<span id=\"rrmday\">", rrmday, "</span>");
+	wc_printf("<br />\n");
 
-	wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
+	wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
 		"value=\"rrmonthtype_wday\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rrmonthtype_is_preselected == 1) ? "checked" : "")
 	);
 
-	wprintf(_("on the "));
-	wprintf("<select name=\"rrmweek\" id=\"rrmweek\" size=\"1\" "
+	wc_printf(_("on the "));
+	wc_printf("<select name=\"rrmweek\" id=\"rrmweek\" size=\"1\" "
 		"onChange=\"RecurrenceShowHide();\">\n");
 	for (i=1; i<=5; ++i) {
-		wprintf("<option %svalue=\"%d\">%s</option>\n",
+		wc_printf("<option %svalue=\"%d\">%s</option>\n",
 			((i==rrmweek) ? "selected " : ""),
 			i,
 			ordinals[i]
 		);
 	}
-	wprintf("</select> \n");
+	wc_printf("</select> \n");
 
-	wprintf("<select name=\"rrmweekday\" id=\"rrmweekday\" size=\"1\" "
+	wc_printf("<select name=\"rrmweekday\" id=\"rrmweekday\" size=\"1\" "
 		"onChange=\"RecurrenceShowHide();\">\n");
 	for (j=0; j<7; ++j) {
 		i = ((j + (int)weekstart) % 7);
-		wprintf("<option %svalue=\"%d\">%s</option>\n",
+		wc_printf("<option %svalue=\"%d\">%s</option>\n",
 			((i==rrmweekday) ? "selected " : ""),
 			i,
 			weekday_labels[i]
 		);
 	}
-	wprintf("</select>");
+	wc_printf("</select>");
 
-	wprintf(" %s<br />\n", _("of the month"));
+	wc_printf(" %s<br />\n", _("of the month"));
 
-	wprintf("</div>\n");				/* end 'monthday_selector' div */
+	wc_printf("</div>\n");				/* end 'monthday_selector' div */
 
 
 	rrymweek = rrmweek;
@@ -634,114 +634,114 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		rrymonth = recur.by_month[0];
 	}
 
-	wprintf("<div id=\"yearday_selector\">");	/* begin 'yearday_selector' div */
+	wc_printf("<div id=\"yearday_selector\">");	/* begin 'yearday_selector' div */
 
-	wprintf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ymday\" "
+	wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ymday\" "
 		"value=\"rryeartype_ymday\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rryeartype_is_preselected == 0) ? "checked" : "")
 	);
-	wprintf(_("every "));
-	wprintf("<span id=\"ymday\">%s</span><br />", _("year on this date"));
+	wc_printf(_("every "));
+	wc_printf("<span id=\"ymday\">%s</span><br />", _("year on this date"));
 
-	wprintf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ywday\" "
+	wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ywday\" "
 		"value=\"rryeartype_ywday\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rryeartype_is_preselected == 1) ? "checked" : "")
 	);
 
-	wprintf(_("on the "));
-	wprintf("<select name=\"rrymweek\" id=\"rrymweek\" size=\"1\" "
+	wc_printf(_("on the "));
+	wc_printf("<select name=\"rrymweek\" id=\"rrymweek\" size=\"1\" "
 		"onChange=\"RecurrenceShowHide();\">\n");
 	for (i=1; i<=5; ++i) {
-		wprintf("<option %svalue=\"%d\">%s</option>\n",
+		wc_printf("<option %svalue=\"%d\">%s</option>\n",
 			((i==rrymweek) ? "selected " : ""),
 			i,
 			ordinals[i]
 		);
 	}
-	wprintf("</select> \n");
+	wc_printf("</select> \n");
 
-	wprintf("<select name=\"rrymweekday\" id=\"rrymweekday\" size=\"1\" "
+	wc_printf("<select name=\"rrymweekday\" id=\"rrymweekday\" size=\"1\" "
 		"onChange=\"RecurrenceShowHide();\">\n");
 	for (j=0; j<7; ++j) {
 		i = ((j + (int)weekstart) % 7);
-		wprintf("<option %svalue=\"%d\">%s</option>\n",
+		wc_printf("<option %svalue=\"%d\">%s</option>\n",
 			((i==rrymweekday) ? "selected " : ""),
 			i,
 			weekday_labels[i]
 		);
 	}
-	wprintf("</select>");
+	wc_printf("</select>");
 
-	wprintf(" %s ", _("of"));
+	wc_printf(" %s ", _("of"));
 
-	wprintf("<select name=\"rrymonth\" id=\"rrymonth\" size=\"1\" "
+	wc_printf("<select name=\"rrymonth\" id=\"rrymonth\" size=\"1\" "
 		"onChange=\"RecurrenceShowHide();\">\n");
 	for (i=1; i<=12; ++i) {
-		wprintf("<option %svalue=\"%d\">%s</option>\n",
+		wc_printf("<option %svalue=\"%d\">%s</option>\n",
 			((i==rrymonth) ? "selected " : ""),
 			i,
 			month_labels[i-1]
 		);
 	}
-	wprintf("</select>");
-	wprintf("<br />\n");
+	wc_printf("</select>");
+	wc_printf("<br />\n");
 
-	wprintf("</div>\n");				/* end 'yearday_selector' div */
+	wc_printf("</div>\n");				/* end 'yearday_selector' div */
 
-	wprintf("</td></tr>\n");
+	wc_printf("</td></tr>\n");
 
 
 	which_rrend_is_preselected = 0;
 	if (!icaltime_is_null_time(recur.until)) which_rrend_is_preselected = 2;
 	if (recur.count > 0) which_rrend_is_preselected = 1;
 
-	wprintf("<tr><td><b>");
-	wprintf(_("Recurrence range"));
-	wprintf("</b></td><td>\n");
+	wc_printf("<tr><td><b>");
+	wc_printf(_("Recurrence range"));
+	wc_printf("</b></td><td>\n");
 
-	wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
+	wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
 		"value=\"rrend_none\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rrend_is_preselected == 0) ? "checked" : "")
 	);
-	wprintf("%s<br />\n", _("No ending date"));
+	wc_printf("%s<br />\n", _("No ending date"));
 
-	wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
+	wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
 		"value=\"rrend_count\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rrend_is_preselected == 1) ? "checked" : "")
 	);
-	wprintf(_("Repeat this event"));
-	wprintf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
-	wprintf("value=\"%d\"> ", recur.count);
-	wprintf(_("times"));
-	wprintf("<br />\n");
+	wc_printf(_("Repeat this event"));
+	wc_printf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
+	wc_printf("value=\"%d\"> ", recur.count);
+	wc_printf(_("times"));
+	wc_printf("<br />\n");
 
-	wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
+	wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
 		"value=\"rrend_until\" "
 		"%s onChange=\"RecurrenceShowHide();\">",
 		((which_rrend_is_preselected == 2) ? "checked" : "")
 	);
-	wprintf(_("Repeat this event until "));
+	wc_printf(_("Repeat this event until "));
 
 	if (icaltime_is_null_time(recur.until)) {
 		recur.until = icaltime_add(t_start, icaldurationtype_from_int(604800));
 	}
 	display_icaltimetype_as_webform(&recur.until, "rruntil", 1);
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 
-	wprintf("</td></tr>\n");
+	wc_printf("</td></tr>\n");
 
-	wprintf("</table>\n");
-	wprintf("</div>\n");				/* end 'rrule' div */
+	wc_printf("</table>\n");
+	wc_printf("</div>\n");				/* end 'rrule' div */
 
 	end_tab(2, 3);
 
 	/* submit buttons (common area beneath the tabs) */
 	begin_tab(3, 3);
-	wprintf("<CENTER>"
+	wc_printf("<CENTER>"
 		"<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
 		"&nbsp;&nbsp;"
 		"<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
@@ -755,10 +755,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		_("Check attendee availability"),
 		_("Cancel")
 	);
-	wprintf("</FORM>\n");
+	wc_printf("</FORM>\n");
 	end_tab(3, 3);
 
-	wprintf("</div>\n");			/* end 'fix_scrollbar_bug' div */
+	wc_printf("</div>\n");			/* end 'fix_scrollbar_bug' div */
 
 	StrBufAppendPrintf(WC->trailing_javascript,
 		"eventEditAllDay();		\n"
diff --git a/webcit/floors.c b/webcit/floors.c
index 5a0ed666a..287bf2d51 100644
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -28,105 +28,105 @@ void display_floorconfig(StrBuf *prepend_html)
 	int refcount;
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n");
-        wprintf("<h1>");
-	wprintf(_("Add/change/delete floors"));
-	wprintf("</h1>");
-        wprintf("</div>\n");
+        wc_printf("<div id=\"banner\">\n");
+        wc_printf("<h1>");
+	wc_printf(_("Add/change/delete floors"));
+	wc_printf("</h1>");
+        wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
                                                                                                                              
 	if (prepend_html != NULL) {
-		wprintf("<br /><b><i>");
+		wc_printf("<br /><b><i>");
 		StrBufAppendBuf(WC->WBuf, prepend_html, 0);
-		wprintf("</i></b><br /><br />\n");
+		wc_printf("</i></b><br /><br />\n");
 	}
 
 	serv_printf("LFLR");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-        	wprintf("<TABLE  class=\"floors_config\"><TR><TD>");
-        	wprintf("<SPAN CLASS=\"titlebar\">");
-		wprintf(_("Error"));
-		wprintf("</SPAN>\n");
-        	wprintf("</TD></TR></TABLE>\n");
-        	wprintf("%s<br />\n", &buf[4]);
+        	wc_printf("<TABLE  class=\"floors_config\"><TR><TD>");
+        	wc_printf("<SPAN CLASS=\"titlebar\">");
+		wc_printf(_("Error"));
+		wc_printf("</SPAN>\n");
+        	wc_printf("</TD></TR></TABLE>\n");
+        	wc_printf("%s<br />\n", &buf[4]);
 		wDumpContent(1);
 		return;
 	}
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<TABLE BORDER=1 WIDTH=100%% bgcolor=\"#ffffff\">\n"
 		"<TR><TH>");
-	wprintf(_("Floor number"));
-	wprintf("</TH><TH>");
-	wprintf(_("Floor name"));
-	wprintf("</TH><TH>");
-	wprintf(_("Number of rooms"));
-	wprintf("</TH><TH>");
-	wprintf(_("Floor CSS"));
-	wprintf("</TH></TR>\n");
+	wc_printf(_("Floor number"));
+	wc_printf("</TH><TH>");
+	wc_printf(_("Floor name"));
+	wc_printf("</TH><TH>");
+	wc_printf(_("Number of rooms"));
+	wc_printf("</TH><TH>");
+	wc_printf(_("Floor CSS"));
+	wc_printf("</TH></TR>\n");
 
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 		floornum = extract_int(buf, 0);
 		extract_token(floorname, buf, 1, '|', sizeof floorname);
 		refcount = extract_int(buf, 2);
 
-		wprintf("<TR><TD><TABLE border=0><TR><TD>%d", floornum);
+		wc_printf("<TR><TD><TABLE border=0><TR><TD>%d", floornum);
 		if (refcount == 0) {
-			wprintf("</TD><TD>"
+			wc_printf("</TD><TD>"
 				"<a href=\"delete_floor?floornum=%d\">"
 				"<FONT SIZE=-1>", floornum);
-			wprintf(_("(delete floor)"));
-			wprintf("</A></FONT><br />");
+			wc_printf(_("(delete floor)"));
+			wc_printf("</A></FONT><br />");
 		}
-		wprintf("<FONT SIZE=-1>"
+		wc_printf("<FONT SIZE=-1>"
 			"<a href=\"display_editfloorpic?"
 			"which_floor=%d\">", floornum);
-		wprintf(_("(edit graphic)"));
-		wprintf("</A></TD></TR></TABLE>");
-		wprintf("</TD>");
+		wc_printf(_("(edit graphic)"));
+		wc_printf("</A></TD></TR></TABLE>");
+		wc_printf("</TD>");
 
-		wprintf("<TD>"
+		wc_printf("<TD>"
 			"<FORM METHOD=\"POST\" action=\"rename_floor\">"
 			"<INPUT TYPE=\"hidden\" NAME=\"floornum\" "
 			"VALUE=\"%d\">"
 			"<INPUT TYPE=\"text\" NAME=\"floorname\" "
 			"VALUE=\"%s\" MAXLENGTH=\"250\">\n",
 			floornum, floorname);
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-		wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
 			"VALUE=\"%s\">"
 			"</FORM></TD>", _("Change name"));
 
-		wprintf("<TD>%d</TD>\n", refcount);
+		wc_printf("<TD>%d</TD>\n", refcount);
 
-		wprintf("<TD>"
+		wc_printf("<TD>"
 			"<FORM METHOD=\"POST\" action=\"set_floor_css\">"
 			"<INPUT TYPE=\"hidden\" NAME=\"floornum\" "
 			"VALUE=\"%d\">"
 			"<INPUT TYPE=\"text\" NAME=\"floorcss\" "
 			"VALUE=\"%s\" MAXLENGTH=\"250\">\n",
 			floornum, floorname);
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-		wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
 			"VALUE=\"%s\">"
 			"</FORM></TD>", _("Change CSS"));
 
-		wprintf("</TR>\n");
+		wc_printf("</TR>\n");
 	}
 
-	wprintf("<TR><TD>&nbsp;</TD>"
+	wc_printf("<TR><TD>&nbsp;</TD>"
 		"<TD><FORM METHOD=\"POST\" action=\"create_floor\">");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"text\" NAME=\"floorname\" "
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<INPUT TYPE=\"text\" NAME=\"floorname\" "
 		"MAXLENGTH=\"250\">\n"
 		"<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
 		"VALUE=\"%s\">"
 		"</FORM></TD>"
 		"<TD>&nbsp;</TD></TR>\n", _("Create new floor"));
 
-	wprintf("</table></div>\n");
+	wc_printf("</table></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/gettext.c b/webcit/gettext.c
index 2c0c1bcca..ced6c7ed3 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -180,24 +180,24 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 
 
 	if (nLocalesLoaded == 1) {
-		wprintf("<p>%s</p>", AvailLangLoaded[0]);
+		wc_printf("<p>%s</p>", AvailLangLoaded[0]);
 		return;
 	}
 
-	wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
+	wc_printf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
 	for (i=0; i < nLocalesLoaded; ++i) {
 #ifndef HAVE_USELOCALE
 		if (strcmp(AvailLangLoaded[i], Lang) == 0)
 #endif
-		wprintf("<option %s value=%s>%s</option>\n",
+		wc_printf("<option %s value=%s>%s</option>\n",
 			((WC->selected_language == i) ? "selected" : ""),
 			AvailLangLoaded[i],
 			AvailLangLoaded[i]
 		);
 	}
 
-	wprintf("</select>\n");
+	wc_printf("</select>\n");
 }
 
 /**
@@ -371,7 +371,7 @@ const char *AvailLang[] = {
 /** \brief dummy for non NLS enabled systems */
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
-	wprintf("English (US)");
+	wc_printf("English (US)");
 }
 
 /** \brief dummy for non NLS enabled systems */
diff --git a/webcit/graphics.c b/webcit/graphics.c
index 8ccd6b0e1..e9a2a713a 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -34,30 +34,30 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
 
 	FreeStrBuf(&Buf);
 
-	wprintf("<form enctype=\"multipart/form-data\" action=\"%s\" "
+	wc_printf("<form enctype=\"multipart/form-data\" action=\"%s\" "
 		"method=\"post\" name=\"graphicsupload\">\n", uplurl);
 
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<input type=\"hidden\" name=\"which_room\" value=\"");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<input type=\"hidden\" name=\"which_room\" value=\"");
 	urlescputs(bstr("which_room"));
-	wprintf("\">\n");
+	wc_printf("\">\n");
 
-	wprintf(_("You can upload an image directly from your computer"));
-	wprintf("<br /><br />\n");
+	wc_printf(_("You can upload an image directly from your computer"));
+	wc_printf("<br /><br />\n");
 
-	wprintf(_("Please select a file to upload:"));
-	wprintf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
+	wc_printf(_("Please select a file to upload:"));
+	wc_printf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
 
-	wprintf("<div class=\"uploadpic\"><img src=\"image?name=%s\"></div>\n", filename);
+	wc_printf("<div class=\"uploadpic\"><img src=\"image?name=%s\"></div>\n", filename);
 
-	wprintf("<div class=\"buttons\">");
-	wprintf("<input type=\"submit\" name=\"upload_button\" value=\"%s\">\n", _("Upload"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"reset\" value=\"%s\">\n", _("Reset form"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
-	wprintf("</div>\n");
-	wprintf("</form>\n");
+	wc_printf("<div class=\"buttons\">");
+	wc_printf("<input type=\"submit\" name=\"upload_button\" value=\"%s\">\n", _("Upload"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"reset\" value=\"%s\">\n", _("Reset form"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+	wc_printf("</div>\n");
+	wc_printf("</form>\n");
 
 	do_template("endbox", NULL);
 
diff --git a/webcit/groupdav_get.c b/webcit/groupdav_get.c
index 7977eb093..c56eb99f7 100644
--- a/webcit/groupdav_get.c
+++ b/webcit/groupdav_get.c
@@ -24,7 +24,7 @@ void groupdav_get_big_ics(void) {
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf("%s\r\n",
+		wc_printf("%s\r\n",
 			&buf[4]
 			);
 		end_burst();
@@ -36,7 +36,7 @@ void groupdav_get_big_ics(void) {
 	hprintf("Content-type: text/calendar; charset=UTF-8\r\n");
 	begin_burst();
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		wprintf("%s\r\n", buf);
+		wc_printf("%s\r\n", buf);
 	}
 	end_burst();
 }
@@ -112,7 +112,7 @@ void groupdav_get(void)
 		hprintf("HTTP/1.1 404 not found\r\n");
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf("The object you requested was not found.\r\n");
+		wc_printf("The object you requested was not found.\r\n");
 		end_burst();
 		return;
 	}
@@ -134,7 +134,7 @@ void groupdav_get(void)
 		hprintf("HTTP/1.1 404 not found\r\n");
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf("There is no folder called \"%s\" on this server.\r\n",
+		wc_printf("There is no folder called \"%s\" on this server.\r\n",
 			ChrPtr(dav_roomname));
 		end_burst();
 		FreeStrBuf(&dav_roomname);
@@ -158,7 +158,7 @@ void groupdav_get(void)
 		hprintf("HTTP/1.1 404 not found\r\n");
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf("Object \"%s\" was not found in the \"%s\" folder.\r\n",
+		wc_printf("Object \"%s\" was not found in the \"%s\" folder.\r\n",
 			ChrPtr(dav_uid),
 			ChrPtr(dav_roomname));
 		end_burst();
@@ -255,7 +255,7 @@ void groupdav_get(void)
 			ptr = memreadline(ptr, buf, sizeof buf);
 	
 			if (in_body) {
-				wprintf("%s\r\n", buf);
+				wc_printf("%s\r\n", buf);
 			}
 			else if ((buf[0] == 0) && (in_body == 0)) {
 				in_body = 1;
diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index 3b9b26760..9b75c5041 100644
--- a/webcit/groupdav_main.c
+++ b/webcit/groupdav_main.c
@@ -163,7 +163,7 @@ void groupdav_main(void)
 		hprintf("HTTP/1.1 501 Method not implemented\r\n");
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf("GroupDAV method \"%s\" is not implemented.\r\n",
+		wc_printf("GroupDAV method \"%s\" is not implemented.\r\n",
 			ReqStrs[WCC->Hdr->HR.eReqType]);
 		end_burst();
 	}
@@ -177,7 +177,7 @@ void groupdav_identify_host(void) {
 	wcsession *WCC = WC;
 
 	if (StrLength(WCC->Hdr->HR.http_host)!=0) {
-		wprintf("%s://%s",
+		wc_printf("%s://%s",
 			(is_https ? "https" : "http"),
 			ChrPtr(WCC->Hdr->HR.http_host));
 	}
diff --git a/webcit/groupdav_options.c b/webcit/groupdav_options.c
index e20d1a07f..9453b503c 100644
--- a/webcit/groupdav_options.c
+++ b/webcit/groupdav_options.c
@@ -58,7 +58,7 @@ void groupdav_options(void)
 		hprintf(
 			"Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf(
+		wc_printf(
 			"There is no folder called \"%s\" on this server.\r\n",
 			ChrPtr(dav_roomname)
 		);
@@ -79,7 +79,7 @@ void groupdav_options(void)
 			groupdav_common_headers();
 			hprintf("Content-Type: text/plain\r\n");
 			begin_burst();
-			wprintf(
+			wc_printf(
 				"Object \"%s\" was not found in the \"%s\" folder.\r\n",
 				ChrPtr(dav_uid),
 				ChrPtr(dav_roomname)
@@ -115,6 +115,6 @@ void groupdav_options(void)
 	hprintf("DAV: 1\r\n");
 	hprintf("Allow: OPTIONS, PROPFIND, GET, PUT\r\n");
 	begin_burst();
-	wprintf("\r\n");
+	wc_printf("\r\n");
 	end_burst();
 }
diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c
index 2a2821f39..e12051265 100644
--- a/webcit/groupdav_propfind.c
+++ b/webcit/groupdav_propfind.c
@@ -85,7 +85,7 @@ void groupdav_collection_list(void)
 
 	begin_burst();
 
-	wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+	wc_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?>"
      		"<multistatus xmlns=\"DAV:\" xmlns:G=\"http://groupdav.org/\">"
 	);
 
@@ -93,44 +93,44 @@ void groupdav_collection_list(void)
 	 * If the client is requesting the root, show a root node.
 	 */
 	if (starting_point == 0) {
-		wprintf("<response>");
-			wprintf("<href>");
+		wc_printf("<response>");
+			wc_printf("<href>");
 				groupdav_identify_host();
-				wprintf("/");
-			wprintf("</href>");
-			wprintf("<propstat>");
-				wprintf("<status>HTTP/1.1 200 OK</status>");
-				wprintf("<prop>");
-					wprintf("<displayname>/</displayname>");
-					wprintf("<resourcetype><collection/></resourcetype>");
-					wprintf("<getlastmodified>");
+				wc_printf("/");
+			wc_printf("</href>");
+			wc_printf("<propstat>");
+				wc_printf("<status>HTTP/1.1 200 OK</status>");
+				wc_printf("<prop>");
+					wc_printf("<displayname>/</displayname>");
+					wc_printf("<resourcetype><collection/></resourcetype>");
+					wc_printf("<getlastmodified>");
 						escputs(datestring);
-					wprintf("</getlastmodified>");
-				wprintf("</prop>");
-			wprintf("</propstat>");
-		wprintf("</response>");
+					wc_printf("</getlastmodified>");
+				wc_printf("</prop>");
+			wc_printf("</propstat>");
+		wc_printf("</response>");
 	}
 
 	/*
 	 * If the client is requesting "/groupdav", show a /groupdav subdirectory.
 	 */
 	if ((starting_point + WCC->Hdr->HR.dav_depth) >= 1) {
-		wprintf("<response>");
-			wprintf("<href>");
+		wc_printf("<response>");
+			wc_printf("<href>");
 				groupdav_identify_host();
-				wprintf("/groupdav");
-			wprintf("</href>");
-			wprintf("<propstat>");
-				wprintf("<status>HTTP/1.1 200 OK</status>");
-				wprintf("<prop>");
-					wprintf("<displayname>GroupDAV</displayname>");
-					wprintf("<resourcetype><collection/></resourcetype>");
-					wprintf("<getlastmodified>");
+				wc_printf("/groupdav");
+			wc_printf("</href>");
+			wc_printf("<propstat>");
+				wc_printf("<status>HTTP/1.1 200 OK</status>");
+				wc_printf("<prop>");
+					wc_printf("<displayname>GroupDAV</displayname>");
+					wc_printf("<resourcetype><collection/></resourcetype>");
+					wc_printf("<getlastmodified>");
 						escputs(datestring);
-					wprintf("</getlastmodified>");
-				wprintf("</prop>");
-			wprintf("</propstat>");
-		wprintf("</response>");
+					wc_printf("</getlastmodified>");
+				wc_printf("</prop>");
+			wc_printf("</propstat>");
+		wc_printf("</response>");
 	}
 
 	/*
@@ -170,53 +170,53 @@ void groupdav_collection_list(void)
 		}
 
 		if ( (is_groupware_collection) && ((starting_point + WCC->Hdr->HR.dav_depth) >= 2) ) {
-			wprintf("<response>");
+			wc_printf("<response>");
 
-			wprintf("<href>");
+			wc_printf("<href>");
 			groupdav_identify_host();
-			wprintf("/groupdav/");
+			wc_printf("/groupdav/");
 			urlescputs(roomname);
-			wprintf("/</href>");
+			wc_printf("/</href>");
 
-			wprintf("<propstat>");
-			wprintf("<status>HTTP/1.1 200 OK</status>");
-			wprintf("<prop>");
-			wprintf("<displayname>");
+			wc_printf("<propstat>");
+			wc_printf("<status>HTTP/1.1 200 OK</status>");
+			wc_printf("<prop>");
+			wc_printf("<displayname>");
 			escputs(roomname);
-			wprintf("</displayname>");
-			wprintf("<resourcetype><collection/>");
+			wc_printf("</displayname>");
+			wc_printf("<resourcetype><collection/>");
 
 			switch(view) {
 			case VIEW_CALENDAR:
-				wprintf("<G:vevent-collection />");
+				wc_printf("<G:vevent-collection />");
 				break;
 			case VIEW_TASKS:
-				wprintf("<G:vtodo-collection />");
+				wc_printf("<G:vtodo-collection />");
 				break;
 			case VIEW_ADDRESSBOOK:
-				wprintf("<G:vcard-collection />");
+				wc_printf("<G:vcard-collection />");
 				break;
 			case VIEW_NOTES:
-				wprintf("<G:vnotes-collection />");
+				wc_printf("<G:vnotes-collection />");
 				break;
 			case VIEW_JOURNAL:
-				wprintf("<G:vjournal-collection />");
+				wc_printf("<G:vjournal-collection />");
 				break;
 			case VIEW_WIKI:
-				wprintf("<G:wiki-collection />");
+				wc_printf("<G:wiki-collection />");
 				break;
 			}
 
-			wprintf("</resourcetype>");
-			wprintf("<getlastmodified>");
+			wc_printf("</resourcetype>");
+			wc_printf("<getlastmodified>");
 				escputs(datestring);
-			wprintf("</getlastmodified>");
-			wprintf("</prop>");
-			wprintf("</propstat>");
-			wprintf("</response>");
+			wc_printf("</getlastmodified>");
+			wc_printf("</prop>");
+			wc_printf("</propstat>");
+			wc_printf("</response>");
 		}
 	}
-	wprintf("</multistatus>\n");
+	wc_printf("</multistatus>\n");
 
 	end_burst();
 }
@@ -270,7 +270,7 @@ void groupdav_propfind(void)
 		groupdav_common_headers();
 		hprintf("Date: %s\r\n", datestring);
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf("There is no folder called \"%s\" on this server.\r\n",
+		wc_printf("There is no folder called \"%s\" on this server.\r\n",
 			ChrPtr(dav_roomname)
 		);
 		end_burst();
@@ -290,7 +290,7 @@ void groupdav_propfind(void)
 			hprintf("HTTP/1.1 404 not found\r\n");
 			groupdav_common_headers();
 			hprintf("Content-Type: text/plain\r\n");
-			wprintf("Object \"%s\" was not found in the \"%s\" folder.\r\n",
+			wc_printf("Object \"%s\" was not found in the \"%s\" folder.\r\n",
 				ChrPtr(dav_uid),
 				ChrPtr(dav_roomname)
 			);
@@ -312,31 +312,31 @@ void groupdav_propfind(void)
 	
 		begin_burst();
 	
-		wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+		wc_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?>"
      			"<multistatus xmlns=\"DAV:\">"
 		);
 
-		wprintf("<response>");
+		wc_printf("<response>");
 		
-		wprintf("<href>");
+		wc_printf("<href>");
 		groupdav_identify_host();
-		wprintf("/groupdav/");
+		wc_printf("/groupdav/");
 		urlescputs(ChrPtr(WCC->wc_roomname));
 		euid_escapize(encoded_uid, ChrPtr(dav_uid));
-		wprintf("/%s", encoded_uid);
-		wprintf("</href>");
-		wprintf("<propstat>");
-		wprintf("<status>HTTP/1.1 200 OK</status>");
-		wprintf("<prop>");
-		wprintf("<getetag>\"%ld\"</getetag>", dav_msgnum);
-		wprintf("<getlastmodified>");
+		wc_printf("/%s", encoded_uid);
+		wc_printf("</href>");
+		wc_printf("<propstat>");
+		wc_printf("<status>HTTP/1.1 200 OK</status>");
+		wc_printf("<prop>");
+		wc_printf("<getetag>\"%ld\"</getetag>", dav_msgnum);
+		wc_printf("<getlastmodified>");
 		escputs(datestring);
-		wprintf("</getlastmodified>");
-		wprintf("</prop>");
-		wprintf("</propstat>");
+		wc_printf("</getlastmodified>");
+		wc_printf("</prop>");
+		wc_printf("</propstat>");
 
-		wprintf("</response>\n");
-		wprintf("</multistatus>\n");
+		wc_printf("</response>\n");
+		wc_printf("</multistatus>\n");
 		end_burst();
 		FreeStrBuf(&dav_roomname);
 		FreeStrBuf(&dav_uid);
@@ -362,49 +362,49 @@ void groupdav_propfind(void)
 
 	begin_burst();
 
-	wprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+	wc_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?>"
      		"<multistatus xmlns=\"DAV:\" xmlns:G=\"http://groupdav.org/\">"
 	);
 
 
 	/* Transmit the collection resource (FIXME check depth and starting point) */
-	wprintf("<response>");
+	wc_printf("<response>");
 
-	wprintf("<href>");
+	wc_printf("<href>");
 	groupdav_identify_host();
-	wprintf("/groupdav/");
+	wc_printf("/groupdav/");
 	urlescputs(ChrPtr(WCC->wc_roomname));
-	wprintf("</href>");
+	wc_printf("</href>");
 
-	wprintf("<propstat>");
-	wprintf("<status>HTTP/1.1 200 OK</status>");
-	wprintf("<prop>");
-	wprintf("<displayname>");
+	wc_printf("<propstat>");
+	wc_printf("<status>HTTP/1.1 200 OK</status>");
+	wc_printf("<prop>");
+	wc_printf("<displayname>");
 	escputs(ChrPtr(WCC->wc_roomname));
-	wprintf("</displayname>");
-	wprintf("<resourcetype><collection/>");
+	wc_printf("</displayname>");
+	wc_printf("<resourcetype><collection/>");
 
 	switch(WCC->wc_default_view) {
 		case VIEW_CALENDAR:
-			wprintf("<G:vevent-collection />");
+			wc_printf("<G:vevent-collection />");
 			break;
 		case VIEW_TASKS:
-			wprintf("<G:vtodo-collection />");
+			wc_printf("<G:vtodo-collection />");
 			break;
 		case VIEW_ADDRESSBOOK:
-			wprintf("<G:vcard-collection />");
+			wc_printf("<G:vcard-collection />");
 			break;
 	}
 
-	wprintf("</resourcetype>");
+	wc_printf("</resourcetype>");
 	/* FIXME get the mtime
-	wprintf("<getlastmodified>");
+	wc_printf("<getlastmodified>");
 		escputs(datestring);
-	wprintf("</getlastmodified>");
+	wc_printf("</getlastmodified>");
 	*/
-	wprintf("</prop>");
-	wprintf("</propstat>");
-	wprintf("</response>");
+	wc_printf("</prop>");
+	wc_printf("</propstat>");
+	wc_printf("</response>");
 
 	/* Transmit the collection listing (FIXME check depth and starting point) */
 
@@ -436,43 +436,43 @@ void groupdav_propfind(void)
 		}
 
 		if (!IsEmptyStr(uid)) {
-			wprintf("<response>");
-				wprintf("<href>");
+			wc_printf("<response>");
+				wc_printf("<href>");
 					groupdav_identify_host();
-					wprintf("/groupdav/");
+					wc_printf("/groupdav/");
 					urlescputs(ChrPtr(WCC->wc_roomname));
 					euid_escapize(encoded_uid, uid);
-					wprintf("/%s", encoded_uid);
-				wprintf("</href>");
+					wc_printf("/%s", encoded_uid);
+				wc_printf("</href>");
 				switch(WCC->wc_default_view) {
 				case VIEW_CALENDAR:
-					wprintf("<getcontenttype>text/x-ical</getcontenttype>");
+					wc_printf("<getcontenttype>text/x-ical</getcontenttype>");
 					break;
 				case VIEW_TASKS:
-					wprintf("<getcontenttype>text/x-ical</getcontenttype>");
+					wc_printf("<getcontenttype>text/x-ical</getcontenttype>");
 					break;
 				case VIEW_ADDRESSBOOK:
-					wprintf("<getcontenttype>text/x-vcard</getcontenttype>");
+					wc_printf("<getcontenttype>text/x-vcard</getcontenttype>");
 					break;
 				}
-				wprintf("<propstat>");
-					wprintf("<status>HTTP/1.1 200 OK</status>");
-					wprintf("<prop>");
-						wprintf("<getetag>\"%ld\"</getetag>", msgs[i]);
+				wc_printf("<propstat>");
+					wc_printf("<status>HTTP/1.1 200 OK</status>");
+					wc_printf("<prop>");
+						wc_printf("<getetag>\"%ld\"</getetag>", msgs[i]);
 					if (now > 0L) {
 						http_datestring(datestring, sizeof datestring, now);
-						wprintf("<getlastmodified>");
+						wc_printf("<getlastmodified>");
 						escputs(datestring);
-						wprintf("</getlastmodified>");
+						wc_printf("</getlastmodified>");
 					}
-					wprintf("</prop>");
-				wprintf("</propstat>");
-			wprintf("</response>");
+					wc_printf("</prop>");
+				wc_printf("</propstat>");
+			wc_printf("</response>");
 		}
 	}
 	FreeStrBuf(&MsgNum);
 
-	wprintf("</multistatus>\n");
+	wc_printf("</multistatus>\n");
 	end_burst();
 
 	if (msgs != NULL) {
diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index 48f0b4a85..d79d17fa8 100644
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -34,7 +34,7 @@ void groupdav_put_bigics(void)
 		groupdav_common_headers();
 		hprintf("Content-type: text/plain\r\n");
 		begin_burst();
-		wprintf("%s\r\n", &buf[4]);
+		wc_printf("%s\r\n", &buf[4]);
 		end_burst();
 		return;
 	}
@@ -72,7 +72,7 @@ void groupdav_put(void)
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf("The object you requested was not found.\r\n");
+		wc_printf("The object you requested was not found.\r\n");
 		end_burst();
 		return;
 	}
@@ -95,7 +95,7 @@ void groupdav_put(void)
 		groupdav_common_headers();
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf("There is no folder called \"%s\" on this server.\r\n",
+		wc_printf("There is no folder called \"%s\" on this server.\r\n",
 			ChrPtr(dav_roomname));
 		end_burst();
 		FreeStrBuf(&dav_roomname);
@@ -148,7 +148,7 @@ void groupdav_put(void)
 		groupdav_common_headers();
 		hprintf("Content-type: text/plain\r\n");
 		begin_burst();
-		wprintf("%s\r\n", &buf[4]);
+		wc_printf("%s\r\n", &buf[4]);
 		end_burst();
 		return;
 	}
@@ -185,7 +185,7 @@ void groupdav_put(void)
 		groupdav_common_headers();
 		hprintf("Content-type: text/plain\r\n");
 		begin_burst();
-		wprintf("new_msgnum is %ld\r\n"
+		wc_printf("new_msgnum is %ld\r\n"
 			"\r\n", new_msgnum);
 		end_burst();
 		FreeStrBuf(&dav_roomname);
diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index b4708881e..70c46023a 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -91,7 +91,7 @@ void doUserIconStylesheet(void) {
 	hprintf("Cache-Control: private\r\n");
 	
 	begin_burst();
-	wprintf("#global { left: 16%%; }\r\n");
+	wc_printf("#global { left: 16%%; }\r\n");
 	pos = GetNewHashPos(WC->IconBarSettings, 0);
 	while(GetNextHashPos(WC->IconBarSettings, pos, &HKLen, &key, &Data)) {
 		value = (long) Data;
@@ -99,9 +99,9 @@ void doUserIconStylesheet(void) {
 		    && strncasecmp("ib_displayas",key,12) 
 		    && strncasecmp("ib_logoff", key, 9)) {
 			/* Don't shoot me for this */
-			wprintf("#%s { display: none !important; }\r\n",key);
+			wc_printf("#%s { display: none !important; }\r\n",key);
 		} else if (!strncasecmp("ib_users",key, 8) && value == 2) {
-			wprintf("#online_users { display: block; !important } \r\n");
+			wc_printf("#online_users { display: block; !important } \r\n");
 		}
 	}
 	DeleteHashPos(&pos);
diff --git a/webcit/listsub.c b/webcit/listsub.c
index f6ed32f2d..4dba177d0 100644
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -31,13 +31,13 @@ void do_listsub(void)
 	output_headers(1, 0, 0, 1, 1, 0);
 	begin_burst();
 
-	wprintf("<HTML><HEAD>\n"
+	wc_printf("<HTML><HEAD>\n"
 		"<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\" />\n"
 		"<link href=\"static/webcit.css\" rel=\"stylesheet\" type=\"text/css\">\n"
 		"<TITLE>\n"
 	);
-	wprintf(_("List subscription"));
-	wprintf("</TITLE></HEAD><BODY>\n");
+	wc_printf(_("List subscription"));
+	wc_printf("</TITLE></HEAD><BODY>\n");
 
 	strcpy(cmd, bstr("cmd"));
 	strcpy(room, bstr("room"));
@@ -45,12 +45,12 @@ void do_listsub(void)
 	strcpy(email, bstr("email"));
 	strcpy(subtype, bstr("subtype"));
 
-	wprintf("<div align=center>");
-	wprintf("<table border=0 width=75%%><tr><td>");
+	wc_printf("<div align=center>");
+	wc_printf("<table border=0 width=75%%><tr><td>");
 
 	svput("BOXTITLE", WCS_STRING, _("List subscribe/unsubscribe"));
 	do_template("beginboxx", NULL);
-	wprintf("<div align=center><br>");
+	wc_printf("<div align=center><br>");
 
 	/*
 	 * Subscribe command
@@ -68,10 +68,10 @@ void do_listsub(void)
 			stresc(escaped_email, 256, email, 0, 0);
 			stresc(escaped_room, 256, room, 0, 0);
 
-			wprintf("<CENTER><H1>");
-			wprintf(_("Confirmation request sent"));
-			wprintf("</H1>");
-			wprintf(_("You are subscribing <TT>%s"
+			wc_printf("<CENTER><H1>");
+			wc_printf(_("Confirmation request sent"));
+			wc_printf("</H1>");
+			wc_printf(_("You are subscribing <TT>%s"
 				"</TT> to the <b>%s</b> mailing list.  "
 				"The listserver has "
 				"sent you an e-mail with one additional "
@@ -84,10 +84,10 @@ void do_listsub(void)
 				"e-mailed to you and your subscription will "
 				"be confirmed.<br />\n"),
 				escaped_email, escaped_room);
-			wprintf("<a href=\"listsub\">%s</A></CENTER>\n", _("Go back..."));
+			wc_printf("<a href=\"listsub\">%s</A></CENTER>\n", _("Go back..."));
 		}
 		else {
-			wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
+			wc_printf("<FONT SIZE=+1><B>ERROR: %s</B>"
 				"</FONT><br /><br />\n",
 				&buf[4]);
 			goto FORM;
@@ -106,12 +106,12 @@ void do_listsub(void)
 		);
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
-			wprintf("<CENTER><H1>Confirmation request sent</H1>"
+			wc_printf("<CENTER><H1>Confirmation request sent</H1>"
 				"You are unsubscribing <TT>");
 			escputs(email);
-			wprintf("</TT> from the &quot;");
+			wc_printf("</TT> from the &quot;");
 			escputs(room);
-			wprintf("&quot; mailing list.  The listserver has "
+			wc_printf("&quot; mailing list.  The listserver has "
 				"sent you an e-mail with one additional "
 				"Web link for you to click on to confirm "
 				"your unsubscription.  This extra step is for "
@@ -125,7 +125,7 @@ void do_listsub(void)
 			);
 		}
 		else {
-			wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
+			wc_printf("<FONT SIZE=+1><B>ERROR: %s</B>"
 				"</FONT><br /><br />\n",
 				&buf[4]);
 			goto FORM;
@@ -142,10 +142,10 @@ void do_listsub(void)
 		);
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
-			wprintf("<CENTER><H1>Confirmation successful!</H1>");
+			wc_printf("<CENTER><H1>Confirmation successful!</H1>");
 		}
 		else {
-			wprintf("<CENTER><H1>Confirmation failed.</H1>"
+			wc_printf("<CENTER><H1>Confirmation failed.</H1>"
 				"This could mean one of two things:<UL>\n"
 				"<LI>You waited too long to confirm your "
 				"subscribe/unsubscribe request (the "
@@ -157,16 +157,16 @@ void do_listsub(void)
 				"The error returned by the server was: "
 			);
 		}
-		wprintf("%s</CENTER><br />\n", &buf[4]);
+		wc_printf("%s</CENTER><br />\n", &buf[4]);
 	}
 
 	/*
 	 * Any other (invalid) command causes the form to be displayed
 	 */
 	else {
-FORM:		wprintf("<form method=\"POST\" action=\"listsub\">\n");
+FORM:		wc_printf("<form method=\"POST\" action=\"listsub\">\n");
 
-		wprintf("Name of list: "
+		wc_printf("Name of list: "
         		"<select name=\"room\" size=1>\n");
 
         	serv_puts("LPRM");
@@ -176,24 +176,24 @@ FORM:		wprintf("<form method=\"POST\" action=\"listsub\">\n");
 				extract_token(sroom, buf, 0, '|', sizeof sroom);
 				self = extract_int(buf, 4) & QR2_SELFLIST ;
 				if (self) {
-					wprintf("<option value=\"");
+					wc_printf("<option value=\"");
 					escputs(sroom);
-					wprintf("\">");
+					wc_printf("\">");
 					escputs(sroom);
-					wprintf("</option>\n");
+					wc_printf("</option>\n");
 				}
                 	}
 		}
-        	wprintf("</select><br><br>\n");
+        	wc_printf("</select><br><br>\n");
 
-		wprintf("Your e-mail address: "
+		wc_printf("Your e-mail address: "
 			"<INPUT TYPE=\"text\" NAME=\"email\" "
 			"VALUE=\""
 		);
 		escputs(email);
-		wprintf("\" maxlength=128 size=60><br><br>\n");
+		wc_printf("\" maxlength=128 size=60><br><br>\n");
 
-		wprintf("(If subscribing) preferred format: "
+		wc_printf("(If subscribing) preferred format: "
 			"<INPUT TYPE=\"radio\" NAME=\"subtype\" "
 			"VALUE=\"list\" CHECKED>One message at a time&nbsp; "
 			"<INPUT TYPE=\"radio\" NAME=\"subtype\" "
@@ -206,7 +206,7 @@ FORM:		wprintf("<form method=\"POST\" action=\"listsub\">\n");
 			"</FORM>\n"
 		);
 
-		wprintf("<hr>When you attempt to subscribe or unsubscribe to "
+		wc_printf("<hr>When you attempt to subscribe or unsubscribe to "
 			"a mailing list, you will receive an e-mail containing"
 			" one additional web link to click on for final "
 			"confirmation.  This extra step is for your "
@@ -216,11 +216,11 @@ FORM:		wprintf("<form method=\"POST\" action=\"listsub\">\n");
 
 	}
 
-	wprintf("</div>");
+	wc_printf("</div>");
 	do_template("endbox", NULL);
-	wprintf("</td></tr></table></div>");
+	wc_printf("</td></tr></table></div>");
 
-	wprintf("</BODY></HTML>\n");
+	wc_printf("</BODY></HTML>\n");
 	wDumpContent(0);
 	end_webcit_session();
 }
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 98e58f59c..da400fc90 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -35,41 +35,41 @@ void display_aide_menu(void)
 void display_generic(void)
 {
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Enter a server command"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
+	wc_printf(_("Enter a server command"));
+	wc_printf("</h1>");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"mainmenu_background\"><tr><td>\n");
 
-	wprintf("<center>");
-	wprintf(_("This screen allows you to enter Citadel server commands which are "
+	wc_printf("<center>");
+	wc_printf(_("This screen allows you to enter Citadel server commands which are "
 		"not supported by WebCit.  If you do not know what that means, "
 		"then this screen will not be of much use to you."));
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 
-	wprintf("<form method=\"post\" action=\"do_generic\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<form method=\"post\" action=\"do_generic\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf(_("Enter command:"));
-	wprintf("<br /><input type=\"text\" name=\"g_cmd\" size=80 maxlength=\"250\"><br />\n");
+	wc_printf(_("Enter command:"));
+	wc_printf("<br /><input type=\"text\" name=\"g_cmd\" size=80 maxlength=\"250\"><br />\n");
 
-	wprintf(_("Command input (if requesting SEND_LISTING transfer mode):"));
-	wprintf("<br /><textarea name=\"g_input\" rows=10 cols=80 width=80></textarea><br />\n");
+	wc_printf(_("Command input (if requesting SEND_LISTING transfer mode):"));
+	wc_printf("<br /><textarea name=\"g_input\" rows=10 cols=80 width=80></textarea><br />\n");
 
-	wprintf("<font size=-2>");
-	wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), ChrPtr(WC->Hdr->HR.http_host));
-	wprintf("</font>\n");
-	wprintf("<input type=\"submit\" name=\"sc_button\" value=\"%s\">", _("Send command"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+	wc_printf("<font size=-2>");
+	wc_printf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), ChrPtr(WC->Hdr->HR.http_host));
+	wc_printf("</font>\n");
+	wc_printf("<input type=\"submit\" name=\"sc_button\" value=\"%s\">", _("Send command"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
 
-	wprintf("</form></center>\n");
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</form></center>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
@@ -97,12 +97,12 @@ void do_generic(void)
 	svput("BOXTITLE", WCS_STRING, _("Server command results"));
 	do_template("beginboxx", NULL);
 
-	wprintf("<table border=0><tr><td>Command:</td><td><tt>");
+	wc_printf("<table border=0><tr><td>Command:</td><td><tt>");
 	StrEscAppend(WCC->WBuf, sbstr("g_cmd"), NULL, 0, 0);
-	wprintf("</tt></td></tr><tr><td>Result:</td><td><tt>");
+	wc_printf("</tt></td></tr><tr><td>Result:</td><td><tt>");
 	StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
 	StrBufAppendBufPlain(WCC->WBuf, HKEY("<br>\n"), 0);
-	wprintf("</tt></td></tr></table><br />\n");
+	wc_printf("</tt></td></tr></table><br />\n");
 	
 	switch (GetServerStatus(Buf, NULL)) {
 	case 8:
@@ -139,9 +139,9 @@ void do_generic(void)
 		free(junk);
 	}
 	
-	wprintf("<hr />");
-	wprintf("<a href=\"display_generic\">Enter another command</a><br />\n");
-	wprintf("<a href=\"display_advanced\">Return to menu</a>\n");
+	wc_printf("<hr />");
+	wc_printf("<a href=\"display_generic\">Enter another command</a><br />\n");
+	wc_printf("<a href=\"display_advanced\">Return to menu</a>\n");
 	do_template("endbox", NULL);
 	FreeStrBuf(&Buf);
 	wDumpContent(1);
@@ -158,7 +158,7 @@ void display_menubar(int as_single_page) {
 
 	if (as_single_page) {
 		output_headers(0, 0, 0, 0, 0, 0);
-		wprintf("<html>\n"
+		wc_printf("<html>\n"
 			"<head>\n"
 			"<title>MenuBar</title>\n"
 			"<style type=\"text/css\">\n"
diff --git a/webcit/messages.c b/webcit/messages.c
index 7e0f8f047..f2b1e1c11 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -515,7 +515,7 @@ void display_headers(void) {
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
 		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			wprintf("%s\n", buf);
+			wc_printf("%s\n", buf);
 		}
 	}
 
@@ -1354,7 +1354,7 @@ void display_enter(void)
 			}
 		}
 		else if (buf[0] != '2') {	/* Any other error means that we cannot continue */
-			wprintf("<em>%s</em><br />\n", &buf[4]);	/* TODO -> important message */
+			wc_printf("<em>%s</em><br />\n", &buf[4]);	/* TODO -> important message */
 			return;
 		}
 	}
@@ -1428,43 +1428,43 @@ void confirm_move_msg(void)
 
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Confirm move of message"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
+	wc_printf(_("Confirm move of message"));
+	wc_printf("</h1>");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<CENTER>");
+	wc_printf("<CENTER>");
 
-	wprintf(_("Move this message to:"));
-	wprintf("<br />\n");
+	wc_printf(_("Move this message to:"));
+	wc_printf("<br />\n");
 
-	wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
+	wc_printf("<form METHOD=\"POST\" action=\"move_msg\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
 
-	wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
+	wc_printf("<SELECT NAME=\"target_room\" SIZE=5>\n");
 	serv_puts("LKRA");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
 		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			extract_token(targ, buf, 0, '|', sizeof targ);
-			wprintf("<OPTION>");
+			wc_printf("<OPTION>");
 			escputs(targ);
-			wprintf("\n");
+			wc_printf("\n");
 		}
 	}
-	wprintf("</SELECT>\n");
-	wprintf("<br />\n");
+	wc_printf("</SELECT>\n");
+	wc_printf("<br />\n");
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
-	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-	wprintf("</form></CENTER>\n");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
+	wc_printf("&nbsp;");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+	wc_printf("</form></CENTER>\n");
 
-	wprintf("</CENTER>\n");
+	wc_printf("</CENTER>\n");
 	wDumpContent(1);
 }
 
@@ -1499,7 +1499,7 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf(_("An error occurred while retrieving this part: %s/%s\n"), 
+		wc_printf(_("An error occurred while retrieving this part: %s/%s\n"), 
 			ChrPtr(partnum), ChrPtr(filename));
 		end_burst();
 	}
@@ -1559,7 +1559,7 @@ void mimepart(int force_download)
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf(_("An error occurred while retrieving this part: %s\n"), 
+		wc_printf(_("An error occurred while retrieving this part: %s\n"), 
 			ChrPtr(Buf));
 		end_burst();
 	}
diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index bf387c3fc..d40d315fb 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -475,9 +475,9 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
 		for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
 			extract_token(buf, mime_submessages, i, '|', sizeof buf);
 			/ ** use printable_view to suppress buttons * /
-			wprintf("<blockquote>");
+			wc_printf("<blockquote>");
 			read_message(Mime->msgnum, 1, ChrPtr(Mime->Section));
-			wprintf("</blockquote>");
+			wc_printf("</blockquote>");
 		}
 	}
 */
@@ -1405,18 +1405,18 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 
 	VS = (bbsview_struct*)*ViewSpecific;
 	if (Stat->nummsgs == 0) {
-		wprintf("<div class=\"nomsgs\"><br><em>");
+		wc_printf("<div class=\"nomsgs\"><br><em>");
 		switch (oper) {
 		case readnew:
-			wprintf(_("No new messages."));
+			wc_printf(_("No new messages."));
 			break;
 		case readold:
-			wprintf(_("No old messages."));
+			wc_printf(_("No old messages."));
 			break;
 		default:
-			wprintf(_("No messages here."));
+			wc_printf(_("No messages here."));
 		}
-		wprintf("</em><br></div>\n");
+		wc_printf("</em><br></div>\n");
 	}
 	else 
 	{
diff --git a/webcit/notes.c b/webcit/notes.c
index 7ffd32c0c..4001d4b40 100644
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -213,7 +213,7 @@ void ajax_update_note(void) {
 
         if (!havebstr("note_uid")) {
 		begin_ajax_response();
-		wprintf("Received ajax_update_note() request without a note UID.");
+		wc_printf("Received ajax_update_note() request without a note UID.");
 		end_ajax_response();
 		return;
 	}
@@ -222,7 +222,7 @@ void ajax_update_note(void) {
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '2') {
 		begin_ajax_response();
-		wprintf("Cannot find message containing vNote with the requested uid!");
+		wc_printf("Cannot find message containing vNote with the requested uid!");
 		end_ajax_response();
 		return;
 	}
@@ -234,7 +234,7 @@ void ajax_update_note(void) {
 			serv_printf("DELE %d", msgnum);
 			serv_getln(buf, sizeof buf);
 			begin_ajax_response();
-			wprintf("%s", buf);
+			wc_printf("%s", buf);
 			end_ajax_response();
 			return;
 		}
@@ -244,7 +244,7 @@ void ajax_update_note(void) {
 	v = vnote_new_from_msg(msgnum, 0);
 	if (!v) {
 		begin_ajax_response();
-		wprintf("Cannot locate a vNote within message %d\n", msgnum);
+		wc_printf("Cannot locate a vNote within message %d\n", msgnum);
 		end_ajax_response();
 		return;
 	}
@@ -426,7 +426,7 @@ int notes_GetParamsGetServerCall(SharedMessageStatus *Stat,
 {
 	strcpy(cmd, "MSGS ALL");
 	Stat->maxmsgs = 32767;
-	wprintf("<div id=\"new_notes_here\"></div>\n");
+	wc_printf("<div id=\"new_notes_here\"></div>\n");
 	return 200;
 
 }
diff --git a/webcit/openid.c b/webcit/openid.c
index e3881924f..b489a55c4 100644
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -16,47 +16,47 @@ void display_openids(void)
 
 	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div class=\"fix_scrollbar_bug\">");
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
 
 	svput("BOXTITLE", WCS_STRING, _("Manage Account/OpenID Associations"));
 	do_template("beginboxx", NULL);
 
 	if (WCC->serv_info->serv_supports_openid) {
 
-		wprintf("<table class=\"altern\">");
+		wc_printf("<table class=\"altern\">");
 	
 		serv_puts("OIDL");
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			bg = 1 - bg;
-			wprintf("<tr class=\"%s\">", (bg ? "even" : "odd"));
-			wprintf("<td><img src=\"static/openid-small.gif\"></td><td>");
+			wc_printf("<tr class=\"%s\">", (bg ? "even" : "odd"));
+			wc_printf("<td><img src=\"static/openid-small.gif\"></td><td>");
 			escputs(buf);
-			wprintf("</td><td>");
-			wprintf("<a href=\"openid_detach?id_to_detach=");
+			wc_printf("</td><td>");
+			wc_printf("<a href=\"openid_detach?id_to_detach=");
 			urlescputs(buf);
-			wprintf("\" onClick=\"return confirm('%s');\">",
+			wc_printf("\" onClick=\"return confirm('%s');\">",
 				_("Do you really want to delete this OpenID?"));
-			wprintf("%s</a>", _("(delete)"));
-			wprintf("</td></tr>\n");
+			wc_printf("%s</a>", _("(delete)"));
+			wc_printf("</td></tr>\n");
 		}
 	
-		wprintf("</table><br />\n");
+		wc_printf("</table><br />\n");
 	
-	        wprintf("<form method=\"POST\" action=\"openid_attach\">\n");
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
-		wprintf(_("Add an OpenID: "));
-	        wprintf("<input type=\"text\" name=\"openid_url\" class=\"openid_urlarea\" size=\"40\">\n");
-	        wprintf("<input type=\"submit\" name=\"attach_button\" value=\"%s\">"
+	        wc_printf("<form method=\"POST\" action=\"openid_attach\">\n");
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
+		wc_printf(_("Add an OpenID: "));
+	        wc_printf("<input type=\"text\" name=\"openid_url\" class=\"openid_urlarea\" size=\"40\">\n");
+	        wc_printf("<input type=\"submit\" name=\"attach_button\" value=\"%s\">"
 			"</form></center>\n", _("Attach"));
 	}
 
 	else {
-		wprintf(_("%s does not permit authentication via OpenID."), ChrPtr(WCC->serv_info->serv_humannode));
+		wc_printf(_("%s does not permit authentication via OpenID."), ChrPtr(WCC->serv_info->serv_humannode));
 	}
 
 	do_template("endbox", NULL);
-	wprintf("</div>");
+	wc_printf("</div>");
 	wDumpContent(2);
 }
 
diff --git a/webcit/paging.c b/webcit/paging.c
index b4d5a3c0c..1ee2782b7 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -14,44 +14,44 @@ void display_page(void)
 	strcpy(recp, bstr("recp"));
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n");
-        wprintf("<h1>");
-	wprintf(_("Send instant message"));
-	wprintf("</h1>");
-        wprintf("</div>\n");
+        wc_printf("<div id=\"banner\">\n");
+        wc_printf("<h1>");
+	wc_printf(_("Send instant message"));
+	wc_printf("</h1>");
+        wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-        wprintf("<div class=\"fix_scrollbar_bug\">"
+        wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"paging_background\"><tr><td>\n");
 
-	wprintf(_("Send an instant message to: "));
+	wc_printf(_("Send an instant message to: "));
 	escputs(recp);
-	wprintf("<br>\n");
+	wc_printf("<br>\n");
 
-	wprintf("<FORM METHOD=\"POST\" action=\"page_user\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<input type=\"hidden\" name=\"template\" value=\"who\">\n");
+	wc_printf("<FORM METHOD=\"POST\" action=\"page_user\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<input type=\"hidden\" name=\"template\" value=\"who\">\n");
 
-	wprintf("<TABLE border=0 width=100%%><TR><TD>\n");
+	wc_printf("<TABLE border=0 width=100%%><TR><TD>\n");
 
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
 	escputs(recp);
-	wprintf("\">\n");
+	wc_printf("\">\n");
 
-	wprintf(_("Enter message text:"));
-	wprintf("<br />");
+	wc_printf(_("Enter message text:"));
+	wc_printf("<br />");
 
-	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
+	wc_printf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
 		"WIDTH=40></TEXTAREA>\n");
 
-	wprintf("</TD></TR></TABLE><br />\n");
+	wc_printf("</TD></TR></TABLE><br />\n");
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"send_button\" VALUE=\"%s\">", _("Send message"));
-	wprintf("<br /><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"send_button\" VALUE=\"%s\">", _("Send message"));
+	wc_printf("<br /><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
 
-	wprintf("</FORM></CENTER>\n");
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</FORM></CENTER>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
@@ -244,7 +244,7 @@ void chat_recv(void) {
 
 	hprintf("Content-type: text/html; charset=utf-8\r\n");
 	begin_burst();
-	wprintf("<html>\n"
+	wc_printf("<html>\n"
 		"<head>\n"
 		"<meta http-equiv=\"refresh\" content=\"3\" />\n"
 		"</head>\n"
@@ -253,8 +253,8 @@ void chat_recv(void) {
 	);
 
 	if (setup_chat_socket() != 0) {
-		wprintf(_("An error occurred while setting up the chat socket."));
-		wprintf("</BODY></HTML>\n");
+		wc_printf(_("An error occurred while setting up the chat socket."));
+		wc_printf("</BODY></HTML>\n");
 		wDumpContent(0);
 		return;
 	}
@@ -300,7 +300,7 @@ void chat_recv(void) {
 	if (end_chat_now) {
 		close(WC->chat_sock);
 		WC->chat_sock = (-1);
-		wprintf("<img src=\"static/blank.gif\" onLoad=\"parent.window.close();\">\n");
+		wc_printf("<img src=\"static/blank.gif\" onLoad=\"parent.window.close();\">\n");
 	}
 
 	if (!IsEmptyStr(output_data)) {
@@ -311,7 +311,7 @@ void chat_recv(void) {
 		}
 
 		/** Output our fun to the other frame. */
-		wprintf("<img src=\"static/blank.gif\" WIDTH=1 HEIGHT=1\n"
+		wc_printf("<img src=\"static/blank.gif\" WIDTH=1 HEIGHT=1\n"
 			"onLoad=\" \n"
 		);
 
@@ -322,10 +322,10 @@ void chat_recv(void) {
 
 			if (strcasecmp(cl_text, "NOOP")) {
 
-				wprintf("parent.chat_transcript.document.write('");
+				wc_printf("parent.chat_transcript.document.write('");
 	
 				if (strcasecmp(cl_user, WC->last_chat_user)) {
-					wprintf("<TABLE border=0 WIDTH=100%% "
+					wc_printf("<TABLE border=0 WIDTH=100%% "
 						"CELLSPACING=1 CELLPADDING=0 "
 						"BGCOLOR=&quot;#FFFFFF&quot;>"
 						"<TR><TD></TR></TD></TABLE>"
@@ -333,50 +333,50 @@ void chat_recv(void) {
 	
 				}
 
-				wprintf("<TABLE border=0 WIDTH=100%% "
+				wc_printf("<TABLE border=0 WIDTH=100%% "
 					"CELLSPACING=0 CELLPADDING=0 "
 					"BGCOLOR=&quot;#EEEEEE&quot;>");
 	
-				wprintf("<TR><TD>");
+				wc_printf("<TR><TD>");
 	
 				if (!strcasecmp(cl_user, ":")) {
-					wprintf("<I>");
+					wc_printf("<I>");
 				}
 
 				if (strcasecmp(cl_user, WC->last_chat_user)) {
-					wprintf("<B>");
+					wc_printf("<B>");
 	
 					if (!strcasecmp(cl_user, ChrPtr(WC->wc_fullname))) {
-						wprintf("<FONT COLOR=&quot;#FF0000&quot;>");
+						wc_printf("<FONT COLOR=&quot;#FF0000&quot;>");
 					}
 					else {
-						wprintf("<FONT COLOR=&quot;#0000FF&quot;>");
+						wc_printf("<FONT COLOR=&quot;#0000FF&quot;>");
 					}
 					jsescputs(cl_user);
 	
-					wprintf("</FONT>: </B>");
+					wc_printf("</FONT>: </B>");
 				}
 				else {
-					wprintf("&nbsp;&nbsp;&nbsp;");
+					wc_printf("&nbsp;&nbsp;&nbsp;");
 				}
 				jsescputs(cl_text);
 				if (!strcasecmp(cl_user, ":")) {
-					wprintf("</I>");
+					wc_printf("</I>");
 				}
 
-				wprintf("</TD></TR></TABLE>");
-				wprintf("'); \n");
+				wc_printf("</TD></TR></TABLE>");
+				wc_printf("'); \n");
 
 				strcpy(WC->last_chat_user, cl_user);
 			}
 		}
 
-		wprintf("parent.chat_transcript.scrollTo(999999,999999);\">\n");
+		wc_printf("parent.chat_transcript.scrollTo(999999,999999);\">\n");
 	}
 
 	free(output_data);
 
-	wprintf("</BODY></HTML>\n");
+	wc_printf("</BODY></HTML>\n");
 	wDumpContent(0);
 }
 
@@ -392,7 +392,7 @@ void chat_send(void) {
 	output_headers(0, 0, 0, 0, 0, 0);
 	hprintf("Content-type: text/html; charset=utf-8\r\n");
 	begin_burst();
-	wprintf("<HTML>"
+	wc_printf("<HTML>"
 		"<BODY onLoad=\"document.chatsendform.send_this.focus();\" >"
 	);
 
@@ -416,8 +416,8 @@ void chat_send(void) {
 	}
 
 	if (setup_chat_socket() != 0) {
-		wprintf(_("An error occurred while setting up the chat socket."));
-		wprintf("</BODY></HTML>\n");
+		wc_printf(_("An error occurred while setting up the chat socket."));
+		wc_printf("</BODY></HTML>\n");
 		wDumpContent(0);
 		return;
 	}
@@ -448,18 +448,18 @@ void chat_send(void) {
 	WC->serv_sock = WC->chat_sock;
 	WC->chat_sock = i;
 
-	wprintf("<FORM METHOD=\"POST\" action=\"chat_send\" NAME=\"chatsendform\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
+	wc_printf("<FORM METHOD=\"POST\" action=\"chat_send\" NAME=\"chatsendform\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
 		"NAME=\"send_this\">\n", SIZ-10);
-	wprintf("<br />");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"send_button\" VALUE=\"%s\">\n", _("Send"));
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"help_button\" VALUE=\"%s\">\n", _("Help"));
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"list_button\" VALUE=\"%s\">\n", _("List users"));
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"exit_button\" VALUE=\"%s\">\n", _("Exit"));
-	wprintf("</FORM>\n");
-
-	wprintf("</BODY></HTML>\n");
+	wc_printf("<br />");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"send_button\" VALUE=\"%s\">\n", _("Send"));
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"help_button\" VALUE=\"%s\">\n", _("Help"));
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"list_button\" VALUE=\"%s\">\n", _("List users"));
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"exit_button\" VALUE=\"%s\">\n", _("Exit"));
+	wc_printf("</FORM>\n");
+
+	wc_printf("</BODY></HTML>\n");
 	wDumpContent(0);
 }
 
diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index 3aefcc9ea..2a9848e36 100644
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -96,7 +96,7 @@ void dump_vars(void)
 	Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
 	while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
 		u = (urlcontent*) U;
-		wprintf("%38s = %s\n", u->url_key, ChrPtr(u->url_data));
+		wc_printf("%38s = %s\n", u->url_key, ChrPtr(u->url_data));
 	}
 }
 
@@ -371,19 +371,19 @@ void tmplput_bstr(StrBuf *Target, WCTemplputParams *TP)
 void diagnostics(void)
 {
 	output_headers(1, 1, 1, 0, 0, 0);
-	wprintf("Session: %d<hr />\n", WC->wc_session);
-	wprintf("Command: <br /><PRE>\n");
+	wc_printf("Session: %d<hr />\n", WC->wc_session);
+	wc_printf("Command: <br /><PRE>\n");
 /*	
 StrEscPuts(WC->UrlFragment1);
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 	StrEscPuts(WC->UrlFragment2);
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 	StrEscPuts(WC->UrlFragment3);
 */
-	wprintf("</PRE><hr />\n");
-	wprintf("Variables: <br /><PRE>\n");
+	wc_printf("</PRE><hr />\n");
+	wc_printf("Variables: <br /><PRE>\n");
 	dump_vars();
-	wprintf("</PRE><hr />\n");
+	wc_printf("</PRE><hr />\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/preferences.c b/webcit/preferences.c
index b7a530c5e..3afa42d81 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -944,11 +944,11 @@ void DeleteGVSNHash(HashList **KillMe)
  */
 void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
 {
-	wprintf("<a href=\"change_start_page?startpage=");
+	wc_printf("<a href=\"change_start_page?startpage=");
 	urlescputs(ChrPtr(WC->Hdr->this_page));
-	wprintf("\">");
-	wprintf(_("Make this my start page"));
-	wprintf("</a>");
+	wc_printf("\">");
+	wc_printf(_("Make this my start page"));
+	wc_printf("</a>");
 }
 
 
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 14c4c3590..685b32c08 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -99,20 +99,20 @@ void room_tree_list(struct roomlisting *rp)
 	strcpy(rmname, rp->rlname);
 	f = rp->rlflags;
 
-	wprintf("<a href=\"dotgoto?room=");
+	wc_printf("<a href=\"dotgoto?room=");
 	urlescputs(rmname);
-	wprintf("\"");
-	wprintf(">");
+	wc_printf("\"");
+	wc_printf(">");
 	escputs1(rmname, 1, 1);
 	if ((f & QR_DIRECTORY) && (f & QR_NETWORK))
-		wprintf("}");
+		wc_printf("}");
 	else if (f & QR_DIRECTORY)
-		wprintf("]");
+		wc_printf("]");
 	else if (f & QR_NETWORK)
-		wprintf(")");
+		wc_printf(")");
 	else
-		wprintf("&gt;");
-	wprintf("</a><tt> </tt>\n");
+		wc_printf("&gt;");
+	wc_printf("</a><tt> </tt>\n");
 
 	room_tree_list(rp->rnext);
 	free(rp);
@@ -158,7 +158,7 @@ void listrms(char *variety)
 	serv_puts(variety);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-		wprintf("&nbsp;");
+		wc_printf("&nbsp;");
 		return;
 	}
 
@@ -201,7 +201,7 @@ void listrms(char *variety)
 	 * If no rooms were listed, print an nbsp to make the cell
 	 * borders show up anyway.
 	 */
-	if (num_rooms == 0) wprintf("&nbsp;");
+	if (num_rooms == 0) wc_printf("&nbsp;");
 }
 
 
@@ -224,8 +224,8 @@ void zapped_list(void)
 
 	listrms("LZRM -1");
 
-	wprintf("<br /><br />\n");
-	wprintf(_("Click on any room to un-zap it and goto that room.\n"));
+	wc_printf("<br /><br />\n");
+	wc_printf(_("Click on any room to un-zap it and goto that room.\n"));
 	do_template("endbox", NULL);
 	wDumpContent(1);
 }
@@ -255,22 +255,22 @@ void readinfo(StrBuf *Target, WCTemplputParams *TP)
 		safestrncpy(briefinfo, fullinfo, sizeof briefinfo);
 		strcpy(&briefinfo[50], "...");
 
-                wprintf("<div class=\"infos\" "
+                wc_printf("<div class=\"infos\" "
 			"onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
 			">"
 		);
 		escputs(briefinfo);
-                wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
-		wprintf("<img class=\"close_infos\" "
+                wc_printf("</div><div id=\"room_infos\" style=\"display:none;\">");
+		wc_printf("<img class=\"close_infos\" "
                 	"onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
 			"src=\"static/closewindow.gif\" alt=\"%s\"  width=\"16\" height=\"16\">",
 			_("Close window")
 		);
 		escputs(fullinfo);
-                wprintf("</div>");
+                wc_printf("</div>");
 	}
 	else {
-		wprintf("&nbsp;");
+		wc_printf("&nbsp;");
 	}
 }
 
@@ -289,44 +289,44 @@ void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
 	serv_puts("OIMG _roompic_");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '2') {
-		wprintf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
+		wc_printf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
 		urlescputs(ChrPtr(WC->wc_roomname));
-		wprintf("\">");
+		wc_printf("\">");
 		serv_puts("CLOS");
 		serv_getln(buf, sizeof buf);
 	}
 	else if (WC->wc_view == VIEW_ADDRESSBOOK) {
-		wprintf("<img class=\"roompic\" alt=\"\" src=\""
+		wc_printf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/viewcontacts_48x.gif"
 			"\" >"
 			);
 	}
 	else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
-		wprintf("<img class=\"roompic\" alt=\"\" src=\""
+		wc_printf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/calarea_48x.gif"
 			"\" width=\"48\" height=\"48\">"
 			);
 	}
 	else if (WC->wc_view == VIEW_TASKS) {
-		wprintf("<img class=\"roompic\" alt=\"\" src=\""
+		wc_printf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/taskmanag_48x.gif"
 			"\" width=\"48\" height=\"48\">"
 			);
 	}
 	else if (WC->wc_view == VIEW_NOTES) {
-		wprintf("<img class=\"roompic\" alt=\"\" src=\""
+		wc_printf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/storenotes_48x.gif"
 			"\" width=\"48\" height=\"48\">"
 			);
 	}
 	else if (WC->wc_view == VIEW_MAILBOX) {
-		wprintf("<img class=\"roompic\" alt=\"\" src=\""
+		wc_printf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/privatemess_48x.gif"
 			"\" width=\"48\" height=\"48\">"
 			);
 	}
 	else {
-		wprintf("<img class=\"roompic\" alt=\"\" src=\""
+		wc_printf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/chatrooms_48x.gif"
 			"\" width=\"48\" height=\"48\">"
 			);
@@ -343,11 +343,11 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
 {
 	int i;
 
-	wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
-	wprintf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<label for=\"view_name\">");
-	wprintf(_("View as:"));
-	wprintf("</label> "
+	wc_printf("<form name=\"viewomatic\" action=\"changeview\">\n");
+	wc_printf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<label for=\"view_name\">");
+	wc_printf(_("View as:"));
+	wc_printf("</label> "
 		"<select name=\"newview\" size=\"1\" "
 		"id=\"view_name\" class=\"selectbox\" "
 		"OnChange=\"location.href=viewomatic.newview.options"
@@ -367,14 +367,14 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
 			/* ||	( (i == 7) && (WC->wc_default_view == 3) )	(calendar list temporarily disabled) */
 			) {
 
-			wprintf("<option %s value=\"changeview?view=%d\">",
+			wc_printf("<option %s value=\"changeview?view=%d\">",
 				((i == WC->wc_view) ? "selected" : ""),
 				i );
 			escputs(viewdefs[i]);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
 	}
-	wprintf("</select></div></form>\n");
+	wc_printf("</select></div></form>\n");
 }
 
 
@@ -383,15 +383,15 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
  */
 void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
 {
-	wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
-	wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<label for=\"srchquery\">");
-	wprintf(_("Search: "));
-	wprintf("</label><input ");
-	wprintf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
-	wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
+	wc_printf("<form name=\"searchomatic\" action=\"do_search\">\n");
+	wc_printf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<label for=\"srchquery\">");
+	wc_printf(_("Search: "));
+	wc_printf("</label><input ");
+	wc_printf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
+	wc_printf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
 		);
-	wprintf("</div></form>\n");
+	wc_printf("</div></form>\n");
 }
 
 
@@ -423,7 +423,7 @@ void embed_room_banner(char *got, int navbar_style) {
 	}
 
 	/* The browser needs some information for its own use */
-	wprintf("<script type=\"text/javascript\">	\n"
+	wc_printf("<script type=\"text/javascript\">	\n"
 		"	room_is_trash = %d;		\n"
 		"</script>\n",
 		WC->wc_is_trash
@@ -477,9 +477,9 @@ void embed_room_banner(char *got, int navbar_style) {
 	/* roombanner contains this for mobile */
 	if (navbar_style != navbar_none && !WC->is_mobile) { 
 
-		wprintf("<div id=\"navbar\"><ul>");
+		wc_printf("<div id=\"navbar\"><ul>");
 
-		if (navbar_style == navbar_default) wprintf(
+		if (navbar_style == navbar_default) wc_printf(
 			"<li class=\"ungoto\">"
 			"<a href=\"ungoto\">"
 			"<img src=\"static/ungoto2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
@@ -488,7 +488,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			);
 
 		if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
-			wprintf(
+			wc_printf(
 				"<li class=\"newmess\">"
 				"<a href=\"readnew\">"
 				"<img src=\"static/newmess2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
@@ -500,7 +500,7 @@ void embed_room_banner(char *got, int navbar_style) {
 		if (navbar_style == navbar_default) {
 			switch(WC->wc_view) {
 			case VIEW_ADDRESSBOOK:
-				wprintf(
+				wc_printf(
 					"<li class=\"viewcontacts\">"
 					"<a href=\"readfwd\">"
 					"<img src=\"static/viewcontacts_24x.gif\" "
@@ -511,7 +511,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_CALENDAR:
-				wprintf(
+				wc_printf(
 					"<li class=\"staskday\">"
 					"<a href=\"readfwd?calview=day\">"
 					"<img src=\"static/taskday2_24x.gif\" "
@@ -520,7 +520,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					"%s"
 					"</span></a></li>\n", _("Day view")
 					);
-				wprintf(
+				wc_printf(
 					"<li class=\"monthview\">"
 					"<a href=\"readfwd?calview=month\">"
 					"<img src=\"static/monthview2_24x.gif\" "
@@ -531,7 +531,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_CALBRIEF:
-				wprintf(
+				wc_printf(
 					"<li class=\"monthview\">"
 					"<a href=\"readfwd?calview=month\">"
 					"<img src=\"static/monthview2_24x.gif\" "
@@ -542,7 +542,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_TASKS:
-				wprintf(
+				wc_printf(
 					"<li class=\"taskmanag\">"
 					"<a href=\"readfwd\">"
 					"<img src=\"static/taskmanag_24x.gif\" "
@@ -553,7 +553,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_NOTES:
-				wprintf(
+				wc_printf(
 					"<li class=\"viewnotes\">"
 					"<a href=\"readfwd\">"
 					"<img src=\"static/viewnotes_24x.gif\" "
@@ -564,7 +564,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_MAILBOX:
-				wprintf(
+				wc_printf(
 					"<li class=\"readallmess\">"
 					"<a id=\"m_refresh\" href=\"readfwd\">"
 					"<img src=\"static/readallmess3_24x.gif\" "
@@ -575,7 +575,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_WIKI:
-				wprintf(
+				wc_printf(
 					"<li class=\"readallmess\">"
 					"<a href=\"readfwd\">"
 					"<img src=\"static/readallmess3_24x.gif\" "
@@ -586,7 +586,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			default:
-				wprintf(
+				wc_printf(
 					"<li class=\"readallmess\">"
 					"<a href=\"readfwd\">"
 					"<img src=\"static/readallmess3_24x.gif\" "
@@ -602,7 +602,7 @@ void embed_room_banner(char *got, int navbar_style) {
 		if (navbar_style == navbar_default) {
 			switch(WC->wc_view) {
 			case VIEW_ADDRESSBOOK:
-				wprintf(
+				wc_printf(
 					"<li class=\"addnewcontact\">"
 					"<a href=\"display_enter\">"
 					"<img src=\"static/addnewcontact_24x.gif\" "
@@ -614,11 +614,11 @@ void embed_room_banner(char *got, int navbar_style) {
 				break;
 			case VIEW_CALENDAR:
 			case VIEW_CALBRIEF:
-				wprintf("<li class=\"addevent\"><a href=\"display_enter");
-				if (havebstr("year" )) wprintf("?year=%s", bstr("year"));
-				if (havebstr("month")) wprintf("?month=%s", bstr("month"));
-				if (havebstr("day"  )) wprintf("?day=%s", bstr("day"));
-				wprintf("\">"
+				wc_printf("<li class=\"addevent\"><a href=\"display_enter");
+				if (havebstr("year" )) wc_printf("?year=%s", bstr("year"));
+				if (havebstr("month")) wc_printf("?month=%s", bstr("month"));
+				if (havebstr("day"  )) wc_printf("?day=%s", bstr("day"));
+				wc_printf("\">"
 					"<img  src=\"static/addevent_24x.gif\" "
 					"alt=\"\" width=\"24\" height=\"24\">"
 					"<span class=\"navbar_link\">"
@@ -627,7 +627,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_TASKS:
-				wprintf(
+				wc_printf(
 					"<li class=\"newmess\">"
 					"<a href=\"display_enter\">"
 					"<img  src=\"static/newmess3_24x.gif\" "
@@ -638,7 +638,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			case VIEW_NOTES:
-				wprintf(
+				wc_printf(
 					"<li class=\"enternewnote\">"
 					"<a href=\"add_new_note\">"
 					"<img  src=\"static/enternewnote_24x.gif\" "
@@ -654,7 +654,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					safestrncpy(buf, "home", sizeof buf);
 				}
 				str_wiki_index(buf);
-				wprintf(
+				wc_printf(
 					"<li class=\"newmess\">"
 					"<a href=\"display_enter?wikipage=%s\">"
 					"<img  src=\"static/newmess3_24x.gif\" "
@@ -666,7 +666,7 @@ void embed_room_banner(char *got, int navbar_style) {
 
 				if (bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), "wiki_history")) {
 					/* already viewing history; display a link to the current page */
-					wprintf(
+					wc_printf(
 						"<li class=\"newmess\">"
 						"<a href=\"wiki?page=%s\">"
 						"<img  src=\"static/newmess3_24x.gif\" "
@@ -678,7 +678,7 @@ void embed_room_banner(char *got, int navbar_style) {
 				}
 				else {
 					/* display a link to the history */
-					wprintf(
+					wc_printf(
 						"<li class=\"newmess\">"
 						"<a href=\"wiki_history?page=%s\">"
 						"<img  src=\"static/newmess3_24x.gif\" "
@@ -690,7 +690,7 @@ void embed_room_banner(char *got, int navbar_style) {
 				}
 				break;
 			case VIEW_MAILBOX:
-				wprintf(
+				wc_printf(
 					"<li class=\"newmess\">"
 					"<a href=\"display_enter\">"
 					"<img  src=\"static/newmess3_24x.gif\" "
@@ -699,7 +699,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					"%s"
 					"</span></a></li>\n", _("Write mail")
 					);
-				wprintf(
+				wc_printf(
 					"<li class=\"newmess\">"
 					"<a href=\"javascript:deleteAllSelectedMessages();\">"
 					"<img  src=\"static/delete.gif\" "
@@ -709,7 +709,7 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 				break;
 			default:
-				wprintf(
+				wc_printf(
 					"<li class=\"newmess\">"
 					"<a href=\"display_enter\">"
 					"<img  src=\"static/newmess3_24x.gif\" "
@@ -722,7 +722,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			}
 		}
 
-		if (navbar_style == navbar_default) wprintf(
+		if (navbar_style == navbar_default) wc_printf(
 			"<li class=\"skipthisroom\">"
 			"<a href=\"skip\" "
 			"title=\"%s\">"
@@ -734,7 +734,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			_("Skip this room")
 			);
 
-		if (navbar_style == navbar_default) wprintf(
+		if (navbar_style == navbar_default) wc_printf(
 			"<li class=\"markngo\">"
 			"<a href=\"gotonext\" "
 			"title=\"%s\">"
@@ -746,7 +746,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			_("Goto next room")
 			);
 
-		wprintf("</ul></div>\n");
+		wc_printf("</ul></div>\n");
 	}
 
 }
@@ -1010,116 +1010,116 @@ void display_editroom(void)
 	FreeStrBuf(&Buf);
 	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div class=\"fix_scrollbar_bug\">");
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
 
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 
 	/* print the tabbed dialog */
-	wprintf("<div align=\"center\">");
-	wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
+	wc_printf("<div align=\"center\">");
+	wc_printf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
 		"<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
 		);
 
-	wprintf("<td class=\"");
+	wc_printf("<td class=\"");
 	if (!strcmp(tab, "admin")) {
-		wprintf(" tab_cell_label\">");
-		wprintf(_("Administration"));
+		wc_printf(" tab_cell_label\">");
+		wc_printf(_("Administration"));
 	}
 	else {
-		wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
-		wprintf(_("Administration"));
-		wprintf("</a>");
+		wc_printf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
+		wc_printf(_("Administration"));
+		wc_printf("</a>");
 	}
-	wprintf("</td>\n");
-	wprintf("<td>&nbsp;</td>\n");
+	wc_printf("</td>\n");
+	wc_printf("<td>&nbsp;</td>\n");
 
 	if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
 
-		wprintf("<td class=\"");
+		wc_printf("<td class=\"");
 		if (!strcmp(tab, "config")) {
-			wprintf(" tab_cell_label\">");
-			wprintf(_("Configuration"));
+			wc_printf(" tab_cell_label\">");
+			wc_printf(_("Configuration"));
 		}
 		else {
-			wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
-			wprintf(_("Configuration"));
-			wprintf("</a>");
+			wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
+			wc_printf(_("Configuration"));
+			wc_printf("</a>");
 		}
-		wprintf("</td>\n");
-		wprintf("<td>&nbsp;</td>\n");
+		wc_printf("</td>\n");
+		wc_printf("<td>&nbsp;</td>\n");
 
-		wprintf("<td class=\"");
+		wc_printf("<td class=\"");
 		if (!strcmp(tab, "expire")) {
-			wprintf(" tab_cell_label\">");
-			wprintf(_("Message expire policy"));
+			wc_printf(" tab_cell_label\">");
+			wc_printf(_("Message expire policy"));
 		}
 		else {
-			wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
-			wprintf(_("Message expire policy"));
-			wprintf("</a>");
+			wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
+			wc_printf(_("Message expire policy"));
+			wc_printf("</a>");
 		}
-		wprintf("</td>\n");
-		wprintf("<td>&nbsp;</td>\n");
+		wc_printf("</td>\n");
+		wc_printf("<td>&nbsp;</td>\n");
 	
-		wprintf("<td class=\"");
+		wc_printf("<td class=\"");
 		if (!strcmp(tab, "access")) {
-			wprintf(" tab_cell_label\">");
-			wprintf(_("Access controls"));
+			wc_printf(" tab_cell_label\">");
+			wc_printf(_("Access controls"));
 		}
 		else {
-			wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
-			wprintf(_("Access controls"));
-			wprintf("</a>");
+			wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
+			wc_printf(_("Access controls"));
+			wc_printf("</a>");
 		}
-		wprintf("</td>\n");
-		wprintf("<td>&nbsp;</td>\n");
+		wc_printf("</td>\n");
+		wc_printf("<td>&nbsp;</td>\n");
 
-		wprintf("<td class=\"");
+		wc_printf("<td class=\"");
 		if (!strcmp(tab, "sharing")) {
-			wprintf(" tab_cell_label\">");
-			wprintf(_("Sharing"));
+			wc_printf(" tab_cell_label\">");
+			wc_printf(_("Sharing"));
 		}
 		else {
-			wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
-			wprintf(_("Sharing"));
-			wprintf("</a>");
+			wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
+			wc_printf(_("Sharing"));
+			wc_printf("</a>");
 		}
-		wprintf("</td>\n");
-		wprintf("<td>&nbsp;</td>\n");
+		wc_printf("</td>\n");
+		wc_printf("<td>&nbsp;</td>\n");
 
-		wprintf("<td class=\"");
+		wc_printf("<td class=\"");
 		if (!strcmp(tab, "listserv")) {
-			wprintf(" tab_cell_label\">");
-			wprintf(_("Mailing list service"));
+			wc_printf(" tab_cell_label\">");
+			wc_printf(_("Mailing list service"));
 		}
 		else {
-			wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
-			wprintf(_("Mailing list service"));
-			wprintf("</a>");
+			wc_printf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
+			wc_printf(_("Mailing list service"));
+			wc_printf("</a>");
 		}
-		wprintf("</td>\n");
-		wprintf("<td>&nbsp;</td>\n");
+		wc_printf("</td>\n");
+		wc_printf("<td>&nbsp;</td>\n");
 
 	}
 
-	wprintf("<td class=\"");
+	wc_printf("<td class=\"");
 	if (!strcmp(tab, "feeds")) {
-		wprintf(" tab_cell_label\">");
-		wprintf(_("Remote retrieval"));
+		wc_printf(" tab_cell_label\">");
+		wc_printf(_("Remote retrieval"));
 	}
 	else {
-		wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
-		wprintf(_("Remote retrieval"));
-		wprintf("</a>");
+		wc_printf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
+		wc_printf(_("Remote retrieval"));
+		wc_printf("</a>");
 	}
-	wprintf("</td>\n");
-	wprintf("<td>&nbsp;</td>\n");
+	wc_printf("</td>\n");
+	wc_printf("<td>&nbsp;</td>\n");
 
-	wprintf("</tr></table>\n");
-	wprintf("</div>\n");
+	wc_printf("</tr></table>\n");
+	wc_printf("</div>\n");
 	/* end tabbed dialog */	
 
-	wprintf("<script type=\"text/javascript\">"
+	wc_printf("<script type=\"text/javascript\">"
 		" Nifty(\"table#AdminTabs td\", \"small transparent top\");"
 		"</script>"
 		);
@@ -1127,38 +1127,38 @@ void display_editroom(void)
 	/* begin content of whatever tab is open now */
 
 	if (!strcmp(tab, "admin")) {
-		wprintf("<div class=\"tabcontent\">");
-		wprintf("<ul>"
+		wc_printf("<div class=\"tabcontent\">");
+		wc_printf("<ul>"
 			"<li><a href=\"delete_room\" "
 			"onClick=\"return confirm('");
-		wprintf(_("Are you sure you want to delete this room?"));
-		wprintf("');\">\n");
-		wprintf(_("Delete this room"));
-		wprintf("</a>\n"
+		wc_printf(_("Are you sure you want to delete this room?"));
+		wc_printf("');\">\n");
+		wc_printf(_("Delete this room"));
+		wc_printf("</a>\n"
 			"<li><a href=\"display_editroompic?which_room=");
 		urlescputs(ChrPtr(WC->wc_roomname));
-		wprintf("\">\n");
-		wprintf(_("Set or change the icon for this room's banner"));
-		wprintf("</a>\n"
+		wc_printf("\">\n");
+		wc_printf(_("Set or change the icon for this room's banner"));
+		wc_printf("</a>\n"
 			"<li><a href=\"display_editinfo\">\n");
-		wprintf(_("Edit this room's Info file"));
-		wprintf("</a>\n"
+		wc_printf(_("Edit this room's Info file"));
+		wc_printf("</a>\n"
 			"</ul>");
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 
 	if (!strcmp(tab, "config")) {
-		wprintf("<div class=\"tabcontent\">");
+		wc_printf("<div class=\"tabcontent\">");
 		serv_puts("GETR");
 		serv_getln(buf, sizeof buf);
 
 		if (!strncmp(buf, "550", 3)) {
-			wprintf("<br><br><div align=center>%s</div><br><br>\n",
+			wc_printf("<br><br><div align=center>%s</div><br><br>\n",
 				_("Higher access is required to access this function.")
 				);
 		}
 		else if (buf[0] != '2') {
-			wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+			wc_printf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
 		}
 		else {
 			extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
@@ -1168,209 +1168,209 @@ void display_editroom(void)
 			er_floor = extract_int(&buf[4], 4);
 			er_flags2 = extract_int(&buf[4], 7);
 	
-			wprintf("<form method=\"POST\" action=\"editroom\">\n");
-			wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+			wc_printf("<form method=\"POST\" action=\"editroom\">\n");
+			wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 		
-			wprintf("<ul><li>");
-			wprintf(_("Name of room: "));
-			wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+			wc_printf("<ul><li>");
+			wc_printf(_("Name of room: "));
+			wc_printf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
 				er_name,
 				(sizeof(er_name)-1)
 				);
 		
-			wprintf("<li>");
-			wprintf(_("Resides on floor: "));
-			wprintf("<select NAME=\"er_floor\" SIZE=\"1\"");
+			wc_printf("<li>");
+			wc_printf(_("Resides on floor: "));
+			wc_printf("<select NAME=\"er_floor\" SIZE=\"1\"");
 			if (er_flags & QR_MAILBOX)
-				wprintf("disabled >\n");
+				wc_printf("disabled >\n");
 			for (i = 0; i < 128; ++i)
 				if (!IsEmptyStr(floorlist[i])) {
-					wprintf("<OPTION ");
+					wc_printf("<OPTION ");
 					if (i == er_floor )
-						wprintf("SELECTED ");
-					wprintf("VALUE=\"%d\">", i);
+						wc_printf("SELECTED ");
+					wc_printf("VALUE=\"%d\">", i);
 					escputs(floorlist[i]);
-					wprintf("</OPTION>\n");
+					wc_printf("</OPTION>\n");
 				}
-			wprintf("</select>\n");
+			wc_printf("</select>\n");
 
-			wprintf("<li>");
-			wprintf(_("Type of room:"));
-			wprintf("<ul>\n");
+			wc_printf("<li>");
+			wc_printf(_("Type of room:"));
+			wc_printf("<ul>\n");
 	
-			wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+			wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
 			if ((er_flags & (QR_PRIVATE + QR_MAILBOX)) == 0)
-				wprintf("CHECKED ");
-			wprintf("OnChange=\""
+				wc_printf("CHECKED ");
+			wc_printf("OnChange=\""
 				"	if (this.form.type[0].checked == true) {	"
 				"		this.form.er_floor.disabled = false;	"
 				"	}						"
 				"\"> ");
-			wprintf(_("Public (automatically appears to everyone)"));
-			wprintf("\n");
+			wc_printf(_("Public (automatically appears to everyone)"));
+			wc_printf("\n");
 	
-			wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
+			wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
 			if ((er_flags & QR_PRIVATE) &&
 			    (er_flags & QR_GUESSNAME))
-				wprintf("CHECKED ");
-			wprintf(" OnChange=\""
+				wc_printf("CHECKED ");
+			wc_printf(" OnChange=\""
 				"	if (this.form.type[1].checked == true) {	"
 				"		this.form.er_floor.disabled = false;	"
 				"	}						"
 				"\"> ");
-			wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+			wc_printf(_("Private - hidden (accessible to anyone who knows its name)"));
 		
-			wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
+			wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
 			if ((er_flags & QR_PRIVATE) &&
 			    (er_flags & QR_PASSWORDED))
-				wprintf("CHECKED ");
-			wprintf(" OnChange=\""
+				wc_printf("CHECKED ");
+			wc_printf(" OnChange=\""
 				"	if (this.form.type[2].checked == true) {	"
 				"		this.form.er_floor.disabled = false;	"
 				"	}						"
 				"\"> ");
-			wprintf(_("Private - require password: "));
-			wprintf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
+			wc_printf(_("Private - require password: "));
+			wc_printf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
 				er_password);
 		
-			wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
+			wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
 			if ((er_flags & QR_PRIVATE)
 			    && ((er_flags & QR_GUESSNAME) == 0)
 			    && ((er_flags & QR_PASSWORDED) == 0))
-				wprintf("CHECKED ");
-			wprintf(" OnChange=\""
+				wc_printf("CHECKED ");
+			wc_printf(" OnChange=\""
 				"	if (this.form.type[3].checked == true) {	"
 				"		this.form.er_floor.disabled = false;	"
 				"	}						"
 				"\"> ");
-			wprintf(_("Private - invitation only"));
+			wc_printf(_("Private - invitation only"));
 		
-			wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+			wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
 			if (er_flags & QR_MAILBOX)
-				wprintf("CHECKED ");
-			wprintf (" OnChange=\""
+				wc_printf("CHECKED ");
+			wc_printf (" OnChange=\""
 				 "	if (this.form.type[4].checked == true) {	"
 				 "		this.form.er_floor.disabled = true;	"
 				 "	}						"
 				 "\"> ");
-			wprintf(_("Personal (mailbox for you only)"));
+			wc_printf(_("Personal (mailbox for you only)"));
 			
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
-			wprintf("> ");
-			wprintf(_("If private, cause current users to forget room"));
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+			wc_printf("> ");
+			wc_printf(_("If private, cause current users to forget room"));
 		
-			wprintf("\n</ul>\n");
+			wc_printf("\n</ul>\n");
 		
-			wprintf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
+			wc_printf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
 			if (er_flags & QR_PREFONLY)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Preferred users only"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Preferred users only"));
 		
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
 			if (er_flags & QR_READONLY)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Read-only room"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Read-only room"));
 		
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
 			if (er_flags2 & QR2_COLLABDEL)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("All users allowed to post may also delete messages"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("All users allowed to post may also delete messages"));
 		
 			/** directory stuff */
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
 			if (er_flags & QR_DIRECTORY)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("File directory room"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("File directory room"));
 	
-			wprintf("\n<ul><li>");
-			wprintf(_("Directory name: "));
-			wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+			wc_printf("\n<ul><li>");
+			wc_printf(_("Directory name: "));
+			wc_printf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
 				er_dirname);
 	
-			wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
+			wc_printf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
 			if (er_flags & QR_UPLOAD)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Uploading allowed"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Uploading allowed"));
 		
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
 			if (er_flags & QR_DOWNLOAD)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Downloading allowed"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Downloading allowed"));
 		
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
 			if (er_flags & QR_VISDIR)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Visible directory"));
-			wprintf("</ul>\n");
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Visible directory"));
+			wc_printf("</ul>\n");
 		
 			/** end of directory stuff */
 	
-			wprintf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
+			wc_printf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
 			if (er_flags & QR_NETWORK)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Network shared room"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Network shared room"));
 	
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
 			if (er_flags & QR_PERMANENT)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Permanent (does not auto-purge)"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Permanent (does not auto-purge)"));
 	
-			wprintf("\n<li><input type=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
+			wc_printf("\n<li><input type=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
 			if (er_flags2 & QR2_SUBJECTREQ)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Subject Required (Force users to specify a message subject)"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Subject Required (Force users to specify a message subject)"));
 	
 			/** start of anon options */
 		
-			wprintf("\n<li>");
-			wprintf(_("Anonymous messages"));
-			wprintf("<ul>\n");
+			wc_printf("\n<li>");
+			wc_printf(_("Anonymous messages"));
+			wc_printf("<ul>\n");
 		
-			wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
+			wc_printf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
 			if (((er_flags & QR_ANONONLY) == 0)
 			    && ((er_flags & QR_ANONOPT) == 0))
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("No anonymous messages"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("No anonymous messages"));
 	
-			wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+			wc_printf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
 			if (er_flags & QR_ANONONLY)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("All messages are anonymous"));
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("All messages are anonymous"));
 		
-			wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
+			wc_printf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
 			if (er_flags & QR_ANONOPT)
-				wprintf("CHECKED ");
-			wprintf("> ");
-			wprintf(_("Prompt user when entering messages"));
-			wprintf("</ul>\n");
+				wc_printf("CHECKED ");
+			wc_printf("> ");
+			wc_printf(_("Prompt user when entering messages"));
+			wc_printf("</ul>\n");
 		
 			/* end of anon options */
 		
-			wprintf("<li>");
-			wprintf(_("Room aide: "));
+			wc_printf("<li>");
+			wc_printf(_("Room aide: "));
 			serv_puts("GETA");
 			serv_getln(buf, sizeof buf);
 			if (buf[0] != '2') {
-				wprintf("<em>%s</em>\n", &buf[4]);
+				wc_printf("<em>%s</em>\n", &buf[4]);
 			} else {
 				extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
-				wprintf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+				wc_printf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
 			}
 		
-			wprintf("</ul><CENTER>\n");
-			wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
+			wc_printf("</ul><CENTER>\n");
+			wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
 				"<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
 				"&nbsp;"
 				"<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
@@ -1379,13 +1379,13 @@ void display_editroom(void)
 				_("Cancel")
 				);
 		}
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 
 
 	/* Sharing the room with other Citadel nodes... */
 	if (!strcmp(tab, "sharing")) {
-		wprintf("<div class=\"tabcontent\">");
+		wc_printf("<div class=\"tabcontent\">");
 
 		shared_with = strdup("");
 		not_shared_with = strdup("");
@@ -1431,99 +1431,99 @@ void display_editroom(void)
 		}
 
 		/* Display the stuff */
-		wprintf("<CENTER><br />"
+		wc_printf("<CENTER><br />"
 			"<table border=1 cellpadding=5><tr>"
 			"<td><B><I>");
-		wprintf(_("Shared with"));
-		wprintf("</I></B></td>"
+		wc_printf(_("Shared with"));
+		wc_printf("</I></B></td>"
 			"<td><B><I>");
-		wprintf(_("Not shared with"));
-		wprintf("</I></B></td></tr>\n"
+		wc_printf(_("Not shared with"));
+		wc_printf("</I></B></td></tr>\n"
 			"<tr><td VALIGN=TOP>\n");
 
-		wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
-		wprintf(_("Remote node name"));
-		wprintf("</td><td>");
-		wprintf(_("Remote room name"));
-		wprintf("</td><td>");
-		wprintf(_("Actions"));
-		wprintf("</td></tr>\n");
+		wc_printf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
+		wc_printf(_("Remote node name"));
+		wc_printf("</td><td>");
+		wc_printf(_("Remote room name"));
+		wc_printf("</td><td>");
+		wc_printf(_("Actions"));
+		wc_printf("</td></tr>\n");
 
 		for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
 			extract_token(buf, shared_with, i, '\n', sizeof buf);
 			extract_token(node, buf, 0, '|', sizeof node);
 			extract_token(remote_room, buf, 1, '|', sizeof remote_room);
 			if (!IsEmptyStr(node)) {
-				wprintf("<form method=\"POST\" action=\"netedit\">");
-				wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-				wprintf("<tr><td>%s</td>\n", node);
+				wc_printf("<form method=\"POST\" action=\"netedit\">");
+				wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+				wc_printf("<tr><td>%s</td>\n", node);
 
-				wprintf("<td>");
+				wc_printf("<td>");
 				if (!IsEmptyStr(remote_room)) {
 					escputs(remote_room);
 				}
-				wprintf("</td>");
+				wc_printf("</td>");
 
-				wprintf("<td>");
+				wc_printf("<td>");
 		
-				wprintf("<input type=\"hidden\" NAME=\"line\" "
+				wc_printf("<input type=\"hidden\" NAME=\"line\" "
 					"VALUE=\"ignet_push_share|");
 				urlescputs(node);
 				if (!IsEmptyStr(remote_room)) {
-					wprintf("|");
+					wc_printf("|");
 					urlescputs(remote_room);
 				}
-				wprintf("\">");
-				wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
-				wprintf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
-				wprintf("<input type=\"submit\" "
+				wc_printf("\">");
+				wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
+				wc_printf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
+				wc_printf("<input type=\"submit\" "
 					"NAME=\"unshare_button\" VALUE=\"%s\">", _("Unshare"));
-				wprintf("</td></tr></form>\n");
+				wc_printf("</td></tr></form>\n");
 			}
 		}
 
-		wprintf("</table>\n");
-		wprintf("</td><td VALIGN=TOP>\n");
-		wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
-		wprintf(_("Remote node name"));
-		wprintf("</td><td>");
-		wprintf(_("Remote room name"));
-		wprintf("</td><td>");
-		wprintf(_("Actions"));
-		wprintf("</td></tr>\n");
+		wc_printf("</table>\n");
+		wc_printf("</td><td VALIGN=TOP>\n");
+		wc_printf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
+		wc_printf(_("Remote node name"));
+		wc_printf("</td><td>");
+		wc_printf(_("Remote room name"));
+		wc_printf("</td><td>");
+		wc_printf(_("Actions"));
+		wc_printf("</td></tr>\n");
 
 		for (i=0; i<num_tokens(not_shared_with, '\n'); ++i) {
 			extract_token(node, not_shared_with, i, '\n', sizeof node);
 			if (!IsEmptyStr(node)) {
-				wprintf("<form method=\"POST\" action=\"netedit\">");
-				wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-				wprintf("<tr><td>");
+				wc_printf("<form method=\"POST\" action=\"netedit\">");
+				wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+				wc_printf("<tr><td>");
 				escputs(node);
-				wprintf("</td><td>"
+				wc_printf("</td><td>"
 					"<input type=\"INPUT\" "
 					"NAME=\"suffix\" "
 					"MAXLENGTH=128>"
 					"</td><td>");
-				wprintf("<input type=\"hidden\" "
+				wc_printf("<input type=\"hidden\" "
 					"NAME=\"line\" "
 					"VALUE=\"ignet_push_share|");
 				urlescputs(node);
-				wprintf("|\">");
-				wprintf("<input type=\"hidden\" NAME=\"tab\" "
+				wc_printf("|\">");
+				wc_printf("<input type=\"hidden\" NAME=\"tab\" "
 					"VALUE=\"sharing\">\n");
-				wprintf("<input type=\"hidden\" NAME=\"cmd\" "
+				wc_printf("<input type=\"hidden\" NAME=\"cmd\" "
 					"VALUE=\"add\">\n");
-				wprintf("<input type=\"submit\" "
+				wc_printf("<input type=\"submit\" "
 					"NAME=\"add_button\" VALUE=\"%s\">", _("Share"));
-				wprintf("</td></tr></form>\n");
+				wc_printf("</td></tr></form>\n");
 			}
 		}
 
-		wprintf("</table>\n");
-		wprintf("</td></tr>"
+		wc_printf("</table>\n");
+		wc_printf("</td></tr>"
 			"</table></CENTER><br />\n"
 			"<I><B>%s</B><ul><li>", _("Notes:"));
-		wprintf(_("When sharing a room, "
+		wc_printf(_("When sharing a room, "
 			  "it must be shared from both ends.  Adding a node to "
 			  "the 'shared' list sends messages out, but in order to"
 			  " receive messages, the other nodes must be configured"
@@ -1535,19 +1535,19 @@ void display_editroom(void)
 			  "</ul></I><br />\n"
 				));
 
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 
 	/* Mailing list management */
 	if (!strcmp(tab, "listserv")) {
 		room_states RoomFlags;
-		wprintf("<div class=\"tabcontent\">");
+		wc_printf("<div class=\"tabcontent\">");
 
-		wprintf("<br /><center>"
+		wc_printf("<br /><center>"
 			"<table BORDER=0 WIDTH=100%% CELLPADDING=5>"
 			"<tr><td VALIGN=TOP>");
 
-		wprintf(_("<i>The contents of this room are being "
+		wc_printf(_("<i>The contents of this room are being "
 			  "mailed <b>as individual messages</b> "
 			  "to the following list recipients:"
 			  "</i><br /><br />\n"));
@@ -1560,24 +1560,24 @@ void display_editroom(void)
 					extract_token(recp, buf, 1, '|', sizeof recp);
 			
 					escputs(recp);
-					wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
+					wc_printf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
 					urlescputs(recp);
-					wprintf("\">");
-					wprintf(_("(remove)"));
-					wprintf("</A><br />");
+					wc_printf("\">");
+					wc_printf(_("(remove)"));
+					wc_printf("</A><br />");
 				}
 			}
-		wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
+		wc_printf("<br /><form method=\"POST\" action=\"netedit\">\n"
 			"<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
 			"<input type=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-		wprintf("<input type=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
-		wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-		wprintf("</form>\n");
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<input type=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
+		wc_printf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+		wc_printf("</form>\n");
 
-		wprintf("</td><td VALIGN=TOP>\n");
+		wc_printf("</td><td VALIGN=TOP>\n");
 		
-		wprintf(_("<i>The contents of this room are being "
+		wc_printf(_("<i>The contents of this room are being "
 			  "mailed <b>in digest form</b> "
 			  "to the following list recipients:"
 			  "</i><br /><br />\n"));
@@ -1590,26 +1590,26 @@ void display_editroom(void)
 					extract_token(recp, buf, 1, '|', sizeof recp);
 			
 					escputs(recp);
-					wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
+					wc_printf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
 						"digestrecp|");
 					urlescputs(recp);
-					wprintf("\">");
-					wprintf(_("(remove)"));
-					wprintf("</A><br />");
+					wc_printf("\">");
+					wc_printf(_("(remove)"));
+					wc_printf("</A><br />");
 				}
 			}
-		wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
+		wc_printf("<br /><form method=\"POST\" action=\"netedit\">\n"
 			"<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
 			"<input type=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-		wprintf("<input type=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
-		wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-		wprintf("</form>\n");
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<input type=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
+		wc_printf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+		wc_printf("</form>\n");
 		
-		wprintf("</td></tr></table>\n");
+		wc_printf("</td></tr></table>\n");
 
 		/** Pop open an address book -- begin **/
-		wprintf("<div align=right>"
+		wc_printf("<div align=right>"
 			"<a href=\"javascript:PopOpenAddressBook('add_as_listrecp|%s|add_as_digestrecp|%s');\" "
 			"title=\"%s\">"
 			"<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
@@ -1622,56 +1622,56 @@ void display_editroom(void)
 			);
 		/* Pop open an address book -- end **/
 
-		wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
+		wc_printf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
 
 		get_roomflags (&RoomFlags);
 		
 		/* Self Service subscription? */
-		wprintf("<table><tr><td>\n");
-		wprintf(_("Allow self-service subscribe/unsubscribe requests."));
-		wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
+		wc_printf("<table><tr><td>\n");
+		wc_printf(_("Allow self-service subscribe/unsubscribe requests."));
+		wc_printf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
 			" <tr><td colspan=\"2\">\n",
 			(is_selflist(&RoomFlags))?"checked":"");
-		wprintf(_("The URL for subscribe/unsubscribe is: "));
-		wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
+		wc_printf(_("The URL for subscribe/unsubscribe is: "));
+		wc_printf("<TT>%s://%s/listsub</TT></td></tr>\n",
 			(is_https ? "https" : "http"),
 			ChrPtr(WC->Hdr->HR.http_host));
 		/* Public posting? */
-		wprintf("<tr><td>");
-		wprintf(_("Allow non-subscribers to mail to this room."));
-		wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
+		wc_printf("<tr><td>");
+		wc_printf(_("Allow non-subscribers to mail to this room."));
+		wc_printf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
 			(is_publiclist(&RoomFlags))?"checked":"");
 		
 		/* Moderated List? */
-		wprintf("<tr><td>");
-		wprintf(_("Room post publication needs Aide permission."));
-		wprintf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
+		wc_printf("<tr><td>");
+		wc_printf(_("Room post publication needs Aide permission."));
+		wc_printf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
 			(is_moderatedlist(&RoomFlags))?"checked":"");
 
 
-		wprintf("<tr><td colspan=\"2\" align=\"center\">"
+		wc_printf("<tr><td colspan=\"2\" align=\"center\">"
 			"<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\"></td></tr>", _("Save changes"));
-		wprintf("</table></form>");
+		wc_printf("</table></form>");
 			
 
-		wprintf("</CENTER>\n");
-		wprintf("</div>");
+		wc_printf("</CENTER>\n");
+		wc_printf("</div>");
 	}
 
 
 	/* Configuration of The Dreaded Auto-Purger */
 	if (!strcmp(tab, "expire")) {
-		wprintf("<div class=\"tabcontent\">");
+		wc_printf("<div class=\"tabcontent\">");
 
 		serv_puts("GPEX room");
 		serv_getln(buf, sizeof buf);
 		if (!strncmp(buf, "550", 3)) {
-			wprintf("<br><br><div align=center>%s</div><br><br>\n",
+			wc_printf("<br><br><div align=center>%s</div><br><br>\n",
 				_("Higher access is required to access this function.")
 				);
 		}
 		else if (buf[0] != '2') {
-			wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+			wc_printf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
 		}
 		else {
 			roompolicy = extract_int(&buf[4], 0);
@@ -1684,105 +1684,105 @@ void display_editroom(void)
 				floorvalue = extract_int(&buf[4], 1);
 			}
 			
-			wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
-			wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-			wprintf("<table border=0 cellspacing=5>\n");
-			wprintf("<tr><td>");
-			wprintf(_("Message expire policy for this room"));
-			wprintf("<br />(");
+			wc_printf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
+			wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+			wc_printf("<table border=0 cellspacing=5>\n");
+			wc_printf("<tr><td>");
+			wc_printf(_("Message expire policy for this room"));
+			wc_printf("<br />(");
 			escputs(ChrPtr(WC->wc_roomname));
-			wprintf(")</td><td>");
-			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
+			wc_printf(")</td><td>");
+			wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
 				((roompolicy == 0) ? "CHECKED" : "") );
-			wprintf(_("Use the default policy for this floor"));
-			wprintf("<br />\n");
-			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
+			wc_printf(_("Use the default policy for this floor"));
+			wc_printf("<br />\n");
+			wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
 				((roompolicy == 1) ? "CHECKED" : "") );
-			wprintf(_("Never automatically expire messages"));
-			wprintf("<br />\n");
-			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
+			wc_printf(_("Never automatically expire messages"));
+			wc_printf("<br />\n");
+			wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
 				((roompolicy == 2) ? "CHECKED" : "") );
-			wprintf(_("Expire by message count"));
-			wprintf("<br />\n");
-			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
+			wc_printf(_("Expire by message count"));
+			wc_printf("<br />\n");
+			wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
 				((roompolicy == 3) ? "CHECKED" : "") );
-			wprintf(_("Expire by message age"));
-			wprintf("<br />");
-			wprintf(_("Number of messages or days: "));
-			wprintf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
-			wprintf("</td></tr>\n");
+			wc_printf(_("Expire by message age"));
+			wc_printf("<br />");
+			wc_printf(_("Number of messages or days: "));
+			wc_printf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
+			wc_printf("</td></tr>\n");
 	
 			if (WC->axlevel >= 6) {
-				wprintf("<tr><td COLSPAN=2><hr /></td></tr>\n");
-				wprintf("<tr><td>");
-				wprintf(_("Message expire policy for this floor"));
-				wprintf("<br />(");
+				wc_printf("<tr><td COLSPAN=2><hr /></td></tr>\n");
+				wc_printf("<tr><td>");
+				wc_printf(_("Message expire policy for this floor"));
+				wc_printf("<br />(");
 				escputs(floorlist[WC->wc_floor]);
-				wprintf(")</td><td>");
-				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
+				wc_printf(")</td><td>");
+				wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
 					((floorpolicy == 0) ? "CHECKED" : "") );
-				wprintf(_("Use the system default"));
-				wprintf("<br />\n");
-				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
+				wc_printf(_("Use the system default"));
+				wc_printf("<br />\n");
+				wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
 					((floorpolicy == 1) ? "CHECKED" : "") );
-				wprintf(_("Never automatically expire messages"));
-				wprintf("<br />\n");
-				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
+				wc_printf(_("Never automatically expire messages"));
+				wc_printf("<br />\n");
+				wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
 					((floorpolicy == 2) ? "CHECKED" : "") );
-				wprintf(_("Expire by message count"));
-				wprintf("<br />\n");
-				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
+				wc_printf(_("Expire by message count"));
+				wc_printf("<br />\n");
+				wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
 					((floorpolicy == 3) ? "CHECKED" : "") );
-				wprintf(_("Expire by message age"));
-				wprintf("<br />");
-				wprintf(_("Number of messages or days: "));
-				wprintf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
+				wc_printf(_("Expire by message age"));
+				wc_printf("<br />");
+				wc_printf(_("Number of messages or days: "));
+				wc_printf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
 					floorvalue);
 			}
 	
-			wprintf("<CENTER>\n");
-			wprintf("<tr><td COLSPAN=2><hr /><CENTER>\n");
-			wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
-			wprintf("&nbsp;");
-			wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-			wprintf("</CENTER></td><tr>\n");
+			wc_printf("<CENTER>\n");
+			wc_printf("<tr><td COLSPAN=2><hr /><CENTER>\n");
+			wc_printf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
+			wc_printf("&nbsp;");
+			wc_printf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+			wc_printf("</CENTER></td><tr>\n");
 	
-			wprintf("</table>\n"
+			wc_printf("</table>\n"
 				"<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
 				"</form>\n"
 				);
 		}
 
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 
 	/* Access controls */
 	if (!strcmp(tab, "access")) {
-		wprintf("<div class=\"tabcontent\">");
+		wc_printf("<div class=\"tabcontent\">");
 		display_whok();
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 
 	/* Fetch messages from remote locations */
 	if (!strcmp(tab, "feeds")) {
-		wprintf("<div class=\"tabcontent\">");
+		wc_printf("<div class=\"tabcontent\">");
 
-		wprintf("<i>");
-		wprintf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
-		wprintf("</i><br />\n");
+		wc_printf("<i>");
+		wc_printf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
+		wc_printf("</i><br />\n");
 
-		wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+		wc_printf("<table class=\"altern\" border=0 cellpadding=5>"
 			"<tr class=\"even\"><th>");
-		wprintf(_("Remote host"));
-		wprintf("</th><th>");
-		wprintf(_("User name"));
-		wprintf("</th><th>");
-		wprintf(_("Password"));
-		wprintf("</th><th>");
-		wprintf(_("Keep messages on server?"));
-		wprintf("</th><th>");
-		wprintf(_("Interval"));
-		wprintf("</th><th> </th></tr>");
+		wc_printf(_("Remote host"));
+		wc_printf("</th><th>");
+		wc_printf(_("User name"));
+		wc_printf("</th><th>");
+		wc_printf(_("Password"));
+		wc_printf("</th><th>");
+		wc_printf(_("Keep messages on server?"));
+		wc_printf("</th><th>");
+		wc_printf(_("Interval"));
+		wc_printf("</th><th> </th></tr>");
 
 		serv_puts("GNET");
 		serv_getln(buf, sizeof buf);
@@ -1793,74 +1793,74 @@ void display_editroom(void)
 					safestrncpy(recp, &buf[11], sizeof recp);
 
 					bg = 1 - bg;
-					wprintf("<tr class=\"%s\">",
+					wc_printf("<tr class=\"%s\">",
 						(bg ? "even" : "odd")
 						);
 
-					wprintf("<td>");
+					wc_printf("<td>");
 					extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
 					escputs(pop3_host);
-					wprintf("</td>");
+					wc_printf("</td>");
 
-					wprintf("<td>");
+					wc_printf("<td>");
 					extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
 					escputs(pop3_user);
-					wprintf("</td>");
+					wc_printf("</td>");
 
-					wprintf("<td>*****</td>");		/* Don't show the password */
+					wc_printf("<td>*****</td>");		/* Don't show the password */
 
-					wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
+					wc_printf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
 
-					wprintf("<td>%ld</td>", extract_long(buf, 5));	/* Fetching interval */
+					wc_printf("<td>%ld</td>", extract_long(buf, 5));	/* Fetching interval */
 			
-					wprintf("<td class=\"button_link\">");
-					wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
+					wc_printf("<td class=\"button_link\">");
+					wc_printf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
 					urlescputs(recp);
-					wprintf("\">");
-					wprintf(_("(remove)"));
-					wprintf("</a></td>");
+					wc_printf("\">");
+					wc_printf(_("(remove)"));
+					wc_printf("</a></td>");
 			
-					wprintf("</tr>");
+					wc_printf("</tr>");
 				}
 			}
 
-		wprintf("<form method=\"POST\" action=\"netedit\">\n"
+		wc_printf("<form method=\"POST\" action=\"netedit\">\n"
 			"<tr>"
 			"<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
 			"<input type=\"hidden\" name=\"prefix\" value=\"pop3client|\">\n");
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-		wprintf("<td>");
-		wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
-		wprintf("</td>");
-		wprintf("<td>");
-		wprintf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
-		wprintf("</td>");
-		wprintf("<td>");
-		wprintf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
-		wprintf("</td>");
-		wprintf("<td>");
-		wprintf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
-		wprintf("</td>");
-		wprintf("<td>");
-		wprintf("<input type=\"text\" id=\"add_as_pop3int\" NAME=\"line_pop3int\" MAXLENGTH=\"5\">");
-		wprintf("</td>");
-		wprintf("<td>");
-		wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-		wprintf("</td></tr>");
-		wprintf("</form></table>\n");
-
-		wprintf("<hr>\n");
-
-		wprintf("<i>");
-		wprintf(_("Fetch the following RSS feeds and store them in this room:"));
-		wprintf("</i><br />\n");
-
-		wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<td>");
+		wc_printf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
+		wc_printf("</td>");
+		wc_printf("<td>");
+		wc_printf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
+		wc_printf("</td>");
+		wc_printf("<td>");
+		wc_printf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
+		wc_printf("</td>");
+		wc_printf("<td>");
+		wc_printf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
+		wc_printf("</td>");
+		wc_printf("<td>");
+		wc_printf("<input type=\"text\" id=\"add_as_pop3int\" NAME=\"line_pop3int\" MAXLENGTH=\"5\">");
+		wc_printf("</td>");
+		wc_printf("<td>");
+		wc_printf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+		wc_printf("</td></tr>");
+		wc_printf("</form></table>\n");
+
+		wc_printf("<hr>\n");
+
+		wc_printf("<i>");
+		wc_printf(_("Fetch the following RSS feeds and store them in this room:"));
+		wc_printf("</i><br />\n");
+
+		wc_printf("<table class=\"altern\" border=0 cellpadding=5>"
 			"<tr class=\"even\"><th>");
-		wprintf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
-		wprintf(_("Feed URL"));
-		wprintf("</th><th>");
-		wprintf("</th></tr>");
+		wc_printf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
+		wc_printf(_("Feed URL"));
+		wc_printf("</th><th>");
+		wc_printf("</th></tr>");
 
 		serv_puts("GNET");
 		serv_getln(buf, sizeof buf);
@@ -1871,46 +1871,46 @@ void display_editroom(void)
 					safestrncpy(recp, &buf[10], sizeof recp);
 
 					bg = 1 - bg;
-					wprintf("<tr class=\"%s\">",
+					wc_printf("<tr class=\"%s\">",
 						(bg ? "even" : "odd")
 						);
 
-					wprintf("<td>");
+					wc_printf("<td>");
 					extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
 					escputs(pop3_host);
-					wprintf("</td>");
+					wc_printf("</td>");
 
-					wprintf("<td class=\"button_link\">");
-					wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
+					wc_printf("<td class=\"button_link\">");
+					wc_printf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
 					urlescputs(recp);
-					wprintf("\">");
-					wprintf(_("(remove)"));
-					wprintf("</a></td>");
+					wc_printf("\">");
+					wc_printf(_("(remove)"));
+					wc_printf("</a></td>");
 			
-					wprintf("</tr>");
+					wc_printf("</tr>");
 				}
 			}
 
-		wprintf("<form method=\"POST\" action=\"netedit\">\n"
+		wc_printf("<form method=\"POST\" action=\"netedit\">\n"
 			"<tr>"
 			"<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
 			"<input type=\"hidden\" name=\"prefix\" value=\"rssclient|\">\n");
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-		wprintf("<td>");
-		wprintf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<td>");
+		wc_printf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
 			"maxlength=\"256\" name=\"line_pop3host\">\n");
-		wprintf("</td>");
-		wprintf("<td>");
-		wprintf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
-		wprintf("</td></tr>");
-		wprintf("</form></table>\n");
+		wc_printf("</td>");
+		wc_printf("<td>");
+		wc_printf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
+		wc_printf("</td></tr>");
+		wc_printf("</form></table>\n");
 
-		wprintf("</div>");
+		wc_printf("</div>");
 	}
 
 
 	/* end content of whatever tab is open now */
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 
 	address_book_popup();
 	wDumpContent(1);
@@ -2240,47 +2240,47 @@ void display_whok(void)
         extract_token(room, &buf[4], 0, '|', sizeof room);
 
         
-	wprintf("<table border=0 CELLSPACING=10><tr VALIGN=TOP><td>");
-	wprintf(_("The users listed below have access to this room.  "
+	wc_printf("<table border=0 CELLSPACING=10><tr VALIGN=TOP><td>");
+	wc_printf(_("The users listed below have access to this room.  "
 		  "To remove a user from the access list, select the user "
 		  "name from the list and click 'Kick'."));
-	wprintf("<br /><br />");
+	wc_printf("<br /><br />");
 	
-        wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-        wprintf("<select NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
+        wc_printf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+        wc_printf("<select NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
         serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
                 while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                         extract_token(username, buf, 0, '|', sizeof username);
-                        wprintf("<OPTION>");
+                        wc_printf("<OPTION>");
                         escputs(username);
-                        wprintf("\n");
+                        wc_printf("\n");
                 }
         }
-        wprintf("</select><br />\n");
+        wc_printf("</select><br />\n");
 
-        wprintf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("Kick"));
-        wprintf("</form></CENTER>\n");
+        wc_printf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("Kick"));
+        wc_printf("</form></CENTER>\n");
 
-	wprintf("</td><td>");
-	wprintf(_("To grant another user access to this room, enter the "
+	wc_printf("</td><td>");
+	wc_printf(_("To grant another user access to this room, enter the "
 		  "user name in the box below and click 'Invite'."));
-	wprintf("<br /><br />");
-
-        wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
-	wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-        wprintf(_("Invite:"));
-	wprintf(" ");
-        wprintf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
+	wc_printf("<br /><br />");
+
+        wc_printf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
+	wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wc_printf(_("Invite:"));
+	wc_printf(" ");
+        wc_printf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
         	"<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
         	"<input type=\"submit\" value=\"%s\">"
 		"</form></CENTER>\n", _("Invite"));
 	/* Pop open an address book -- begin **/
-	wprintf(
+	wc_printf(
 		"<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
 		"title=\"%s\">"
 		"<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
@@ -2290,7 +2290,7 @@ void display_whok(void)
 		);
 	/* Pop open an address book -- end **/
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 	address_book_popup();
         wDumpContent(1);
 }
@@ -2322,31 +2322,31 @@ void display_entroom(void)
 	svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
 	do_template("beginbox", NULL);
 
-	wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf("<table class=\"altern\"> ");
+	wc_printf("<table class=\"altern\"> ");
 
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(_("Name of room: "));
-	wprintf("</td><td>");
-	wprintf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
-        wprintf("</td></tr>");
+	wc_printf("<tr class=\"even\"><td>");
+	wc_printf(_("Name of room: "));
+	wc_printf("</td><td>");
+	wc_printf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
+        wc_printf("</td></tr>");
 
-	wprintf("<tr class=\"odd\"><td>");
-	wprintf(_("Resides on floor: "));
-	wprintf("</td><td>");
+	wc_printf("<tr class=\"odd\"><td>");
+	wc_printf(_("Resides on floor: "));
+	wc_printf("</td><td>");
         load_floorlist(Buf); 
-        wprintf("<select name=\"er_floor\" size=\"1\">\n");
+        wc_printf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
                 if (!IsEmptyStr(floorlist[i])) {
-                        wprintf("<option ");
-                        wprintf("value=\"%d\">", i);
+                        wc_printf("<option ");
+                        wc_printf("value=\"%d\">", i);
                         escputs(floorlist[i]);
-                        wprintf("</option>\n");
+                        wc_printf("</option>\n");
                 }
-        wprintf("</select>\n");
-        wprintf("</td></tr>");
+        wc_printf("</select>\n");
+        wc_printf("</td></tr>");
 
 	/*
 	 * Our clever little snippet of JavaScript automatically selects
@@ -2354,10 +2354,10 @@ void display_entroom(void)
 	 * it selects a mailbox room otherwise.  The user can override this,
 	 * of course.  We also disable the floor selector for mailboxes.
 	 */
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(_("Default view for room: "));
-	wprintf("</td><td>");
-        wprintf("<select name=\"er_view\" size=\"1\" OnChange=\""
+	wc_printf("<tr class=\"even\"><td>");
+	wc_printf(_("Default view for room: "));
+	wc_printf("</td><td>");
+        wc_printf("<select name=\"er_view\" size=\"1\" OnChange=\""
 		"	if ( (this.form.er_view.value == 0)		"
 		"	   || (this.form.er_view.value == 6) ) {	"
 		"		this.form.type[0].checked=true;		"
@@ -2370,72 +2370,72 @@ void display_entroom(void)
 		"\">\n");
 	for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
 		if (is_view_allowed_as_default(i)) {
-			wprintf("<option %s value=\"%d\">",
+			wc_printf("<option %s value=\"%d\">",
 				((i == 0) ? "selected" : ""), i );
 			escputs(viewdefs[i]);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
 	}
-	wprintf("</select>\n");
-	wprintf("</td></tr>");
+	wc_printf("</select>\n");
+	wc_printf("</td></tr>");
 
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(_("Type of room:"));
-	wprintf("</td><td>");
-	wprintf("<ul class=\"adminlist\">\n");
+	wc_printf("<tr class=\"even\"><td>");
+	wc_printf(_("Type of room:"));
+	wc_printf("</td><td>");
+	wc_printf("<ul class=\"adminlist\">\n");
 
-	wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-	wprintf("CHECKED OnChange=\""
+	wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+	wc_printf("CHECKED OnChange=\""
 		"	if (this.form.type[0].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
-	wprintf(_("Public (automatically appears to everyone)"));
-	wprintf("</li>");
+	wc_printf(_("Public (automatically appears to everyone)"));
+	wc_printf("</li>");
 
-	wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
+	wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
 		"	if (this.form.type[1].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
-	wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
-	wprintf("</li>");
+	wc_printf(_("Private - hidden (accessible to anyone who knows its name)"));
+	wc_printf("</li>");
 
-	wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
+	wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
 		"	if (this.form.type[2].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
-	wprintf(_("Private - require password: "));
-	wprintf("<input type=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
-	wprintf("</li>");
+	wc_printf(_("Private - require password: "));
+	wc_printf("<input type=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+	wc_printf("</li>");
 
-	wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
+	wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
 		"	if (this.form.type[3].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
-	wprintf(_("Private - invitation only"));
-	wprintf("</li>");
+	wc_printf(_("Private - invitation only"));
+	wc_printf("</li>");
 
-	wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" "
+	wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" "
 		"OnChange=\""
 		"	if (this.form.type[4].checked == true) {	"
 		"		this.form.er_floor.disabled = true;	"
 		"	}						"
 		"\"> ");
-	wprintf(_("Personal (mailbox for you only)"));
-	wprintf("</li>");
-
-	wprintf("\n</ul>\n");
-	wprintf("</td></tr></table>\n");
-
-	wprintf("<div class=\"buttons\">\n");
-	wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
-	wprintf("</div>\n");
-	wprintf("</form>\n<hr />");
+	wc_printf(_("Personal (mailbox for you only)"));
+	wc_printf("</li>");
+
+	wc_printf("\n</ul>\n");
+	wc_printf("</td></tr></table>\n");
+
+	wc_printf("<div class=\"buttons\">\n");
+	wc_printf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
+	wc_printf("</div>\n");
+	wc_printf("</form>\n<hr />");
 	serv_printf("MESG roomaccess");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
@@ -2562,40 +2562,40 @@ void display_private(char *rname, int req_pass)
 
 	FreeStrBuf(&Buf);
 
-	wprintf("<p>");
-	wprintf(_("If you know the name of a hidden (guess-name) or "
+	wc_printf("<p>");
+	wc_printf(_("If you know the name of a hidden (guess-name) or "
 		  "passworded room, you can enter that room by typing "
 		  "its name below.  Once you gain access to a private "
 		  "room, it will appear in your regular room listings "
 		  "so you don't have to keep returning here."));
-	wprintf("</p>");
+	wc_printf("</p>");
 
-	wprintf("<form method=\"post\" action=\"goto_private\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<form method=\"post\" action=\"goto_private\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf("<table class=\"altern\"> "
+	wc_printf("<table class=\"altern\"> "
 		"<tr class=\"even\"><td>");
-	wprintf(_("Enter room name:"));
-	wprintf("</td><td>"
+	wc_printf(_("Enter room name:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"gr_name\" "
 		"value=\"%s\" maxlength=\"128\">\n", rname);
 
 	if (req_pass) {
-		wprintf("</td></tr><tr class=\"odd\"><td>");
-		wprintf(_("Enter room password:"));
-		wprintf("</td><td>");
-		wprintf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
+		wc_printf("</td></tr><tr class=\"odd\"><td>");
+		wc_printf(_("Enter room password:"));
+		wc_printf("</td><td>");
+		wc_printf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
 	}
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
-	wprintf("<div class=\"buttons\">\n");
-	wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
+	wc_printf("<div class=\"buttons\">\n");
+	wc_printf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
 		"&nbsp;"
 		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
 		_("Go there"),
 		_("Cancel")
 		);
-	wprintf("</div></form>\n");
+	wc_printf("</div></form>\n");
 
 	do_template("endbox", NULL);
 
@@ -2629,7 +2629,7 @@ void goto_private(void)
 		return;
 	}
 	output_headers(1, 1, 1, 0, 0, 0);
-	wprintf("%s\n", &buf[4]);
+	wc_printf("%s\n", &buf[4]);
 	wDumpContent(1);
 	return;
 }
@@ -2642,24 +2642,24 @@ void display_zap(void)
 {
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Zap (forget/unsubscribe) the current room"));
-	wprintf("</h1>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
+	wc_printf(_("Zap (forget/unsubscribe) the current room"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf(_("If you select this option, <em>%s</em> will "
+	wc_printf(_("If you select this option, <em>%s</em> will "
 		  "disappear from your room list.  Is this what you wish "
 		  "to do?<br />\n"), ChrPtr(WC->wc_roomname));
 
-	wprintf("<form method=\"POST\" action=\"zap\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-	wprintf("</form>\n");
+	wc_printf("<form method=\"POST\" action=\"zap\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+	wc_printf("</form>\n");
 	wDumpContent(1);
 }
 
@@ -2993,9 +2993,9 @@ void dotgoto(void) {
 
 void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
 {
-	wprintf("<div id=\"banner\">\n");
+	wc_printf("<div id=\"banner\">\n");
 	embed_room_banner(NULL, navbar_default);
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 }
 
 
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index ed5010e4e..abb95fa0a 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -169,7 +169,7 @@ int GetConnected (void)
 		FreeStrBuf(&Buf);
 		/* Are there too many users already logged in? */
 		if (Status == 571) {
-			wprintf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
+			wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
 			end_burst();
 			end_webcit_session();
 			return 1;
@@ -193,7 +193,7 @@ int GetConnected (void)
 			WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
 		if (WCC->serv_info == NULL){
 			begin_burst();
-			wprintf(_("Received unexpected answer from Citadel "
+			wc_printf(_("Received unexpected answer from Citadel "
 				  "server; bailing out."));
 			hprintf("HTTP/1.1 200 OK\r\n");
 			hprintf("Content-type: text/plain; charset=utf-8\r\n");
@@ -203,7 +203,7 @@ int GetConnected (void)
 		}
 		if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
 			begin_burst();
-			wprintf(_("You are connected to a Citadel "
+			wc_printf(_("You are connected to a Citadel "
 				  "server running Citadel %d.%02d. \n"
 				  "In order to run this version of WebCit "
 				  "you must also have Citadel %d.%02d or"
@@ -243,7 +243,7 @@ void _fmout(StrBuf *Target, char *align)
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
 		if ((intext == 1) && (isspace(buf[0]))) {
-			wprintf("<br />");
+			wc_printf("<br />");
 		}
 		intext = 1;
 
@@ -269,9 +269,9 @@ void _fmout(StrBuf *Target, char *align)
 		StrBufAppendBufPlain(Target, HKEY("\n"), 0);
 	}
 	if (bq == 1) {
-		wprintf("</I>");
+		wc_printf("</I>");
 	}
-	wprintf("</div><br />\n");
+	wc_printf("</div><br />\n");
 }
 
 void FmOut(StrBuf *Target, char *align, StrBuf *Source)
@@ -363,7 +363,7 @@ void pullquote_fmout(void) {
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
 		if ((intext == 1) && (isspace(buf[0]))) {
-			wprintf("<br />");
+			wc_printf("<br />");
 		}
 		intext = 1;
 
@@ -373,10 +373,10 @@ void pullquote_fmout(void) {
 		 * " >" quotes and will convert to <BLOCKQUOTE> tags.
 		 */
 		if ((bq == 0) && (!strncmp(buf, " >", 2))) {
-			wprintf("<BLOCKQUOTE>");
+			wc_printf("<BLOCKQUOTE>");
 			bq = 1;
 		} else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-			wprintf("</BLOCKQUOTE>");
+			wc_printf("</BLOCKQUOTE>");
 			bq = 0;
 		}
 		if ((bq == 1) && (!strncmp(buf, " >", 2))) {
@@ -386,7 +386,7 @@ void pullquote_fmout(void) {
 		msgescputs(buf);
 	}
 	if (bq == 1) {
-		wprintf("</I>");
+		wc_printf("</I>");
 	}
 }
 
@@ -524,9 +524,9 @@ void server_to_text()
 
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 		if ((buf[0] == 32) && (count > 0)) {
-			wprintf("\n");
+			wc_printf("\n");
 		}
-		wprintf("%s", buf);
+		wc_printf("%s", buf);
 		++count;
 	}
 }
diff --git a/webcit/setup.c b/webcit/setup.c
index f0bf85fd8..91a979411 100644
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -23,6 +23,8 @@ char suggested_url[SIZ];
 
 /* some copies... */
 int lprintf(int loglevel, const char *format, ...){return 0;}
+void wc_printf(const char *format,...){}
+
 void RegisterNS(const char *NSName, long len, 
 		int nMinArgs, 
 		int nMaxArgs, 
diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index 66deb8c12..4e1df2f4c 100644
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -28,27 +28,27 @@ void do_setup_wizard(void)
 
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64");
-	wprintf("<h1>&nbsp;First time setup</h1>");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64");
+	wc_printf("<h1>&nbsp;First time setup</h1>");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<form method=\"post\" action=\"setup_wizard\">\n"
 	);
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf("<div align=center>"
+	wc_printf("<div align=center>"
 		"This is where the setup wizard will be placed.<br>\n"
 		"For now, just click Finish.<br><br>\n"
 	);
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Next\">\n");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Finish\">\n");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Next\">\n");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Finish\">\n");
 
-	wprintf("</form></div></div>\n");
+	wc_printf("</form></div></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 54977f2f8..8e333031b 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -16,23 +16,23 @@ void display_no_sieve(void) {
 
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<img src=\"static/advanpage2_48x.gif\">");
-	wprintf("<h1>");
-	wprintf(_("View/edit server-side mail filters"));
-	wprintf("</h1>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+	wc_printf("<h1>");
+	wc_printf(_("View/edit server-side mail filters"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"sieve_background\">"
 		"<tr><td valign=top>\n");
 
-	wprintf(_("This installation of Citadel was built without support for server-side mail filtering."
+	wc_printf(_("This installation of Citadel was built without support for server-side mail filtering."
 		"<br>Please contact your system administrator if you require this feature.<br>"));
 
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
@@ -73,7 +73,7 @@ void display_sieve(void)
 
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<script type=\"text/javascript\">					\n"
+	wc_printf("<script type=\"text/javascript\">					\n"
 		"									\n"
 		"var previously_active_script;						\n"
 		"									\n"
@@ -101,117 +101,117 @@ void display_sieve(void)
 		"</script>								\n"
 	);
 
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<img src=\"static/advanpage2_48x.gif\">");
-	wprintf("<h1>");
-	wprintf(_("View/edit server-side mail filters"));
-	wprintf("</h1>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+	wc_printf("<h1>");
+	wc_printf(_("View/edit server-side mail filters"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"sieve_background\">"
 		"<tr><td valign=top>\n");
 
 
-	wprintf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf(_("When new mail arrives: "));
-        wprintf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
+	wc_printf(_("When new mail arrives: "));
+        wc_printf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
 
-	wprintf("<option %s value=\"0\">", ((active_script < 0) ? "selected" : ""));
-	wprintf(_("Leave it in my inbox without filtering"));
-	wprintf("</option>\n");
+	wc_printf("<option %s value=\"0\">", ((active_script < 0) ? "selected" : ""));
+	wc_printf(_("Leave it in my inbox without filtering"));
+	wc_printf("</option>\n");
 
-	wprintf("<option %s value=\"1\">", ((rules_script_is_active) ? "selected" : ""));
-	wprintf(_("Filter it according to rules selected below"));
-	wprintf("</option>\n");
+	wc_printf("<option %s value=\"1\">", ((rules_script_is_active) ? "selected" : ""));
+	wc_printf(_("Filter it according to rules selected below"));
+	wc_printf("</option>\n");
 
-	wprintf("<option %s value=\"2\">",
+	wc_printf("<option %s value=\"2\">",
 			(((active_script >= 0) && (!rules_script_is_active)) ? "selected" : ""));
-	wprintf(_("Filter it through a manually edited script (advanced users only)"));
-	wprintf("</option>\n");
+	wc_printf(_("Filter it through a manually edited script (advanced users only)"));
+	wc_printf("</option>\n");
 
-	wprintf("</select>");
+	wc_printf("</select>");
 
 
 
 	/* The "no filtering" div */
 
-	wprintf("<div id=\"sievediv0\" style=\"display:none\">\n");
-	wprintf("<div align=\"center\"><br /><br />");
-	wprintf(_("Your incoming mail will not be filtered through any scripts."));
-	wprintf("<br /><br /></div>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"sievediv0\" style=\"display:none\">\n");
+	wc_printf("<div align=\"center\"><br /><br />");
+	wc_printf(_("Your incoming mail will not be filtered through any scripts."));
+	wc_printf("<br /><br /></div>\n");
+	wc_printf("</div>\n");
 
 	/* The "webcit managed scripts" div */
 
-	wprintf("<div id=\"sievediv1\" style=\"display:none\">\n");
+	wc_printf("<div id=\"sievediv1\" style=\"display:none\">\n");
 	display_rules_editor_inner_div();
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 
 	/* The "I'm smart and can write my own Sieve scripts" div */
 
-	wprintf("<div id=\"sievediv2\" style=\"display:none\">\n");
+	wc_printf("<div id=\"sievediv2\" style=\"display:none\">\n");
 
 	if (num_scripts > 0) {
-		wprintf(_("The currently active script is: "));
-        	wprintf("<select name=\"active_script\" size=1 onChange=\"ToggleScriptPanels();\">\n");
+		wc_printf(_("The currently active script is: "));
+        	wc_printf("<select name=\"active_script\" size=1 onChange=\"ToggleScriptPanels();\">\n");
 		for (i=0; i<num_scripts; ++i) {
 			if (strcasecmp(script_names[i], RULES_SCRIPT)) {
-				wprintf("<option %s value=\"%s\">%s</option>\n",
+				wc_printf("<option %s value=\"%s\">%s</option>\n",
 					((active_script == i) ? "selected" : ""),
 					script_names[i],
 					script_names[i]
 				);
 			}
 		}
-		wprintf("</select>\n");
+		wc_printf("</select>\n");
 	}
 
-	wprintf("&nbsp;&nbsp;&nbsp;");
-	wprintf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
+	wc_printf("&nbsp;&nbsp;&nbsp;");
+	wc_printf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
 
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 
 	if (num_scripts > 0) {
 		for (i=0; i<num_scripts; ++i) {
 			if (strcasecmp(script_names[i], RULES_SCRIPT)) {
-				wprintf("<div id=\"script_%s\" style=\"display:none\">\n", script_names[i]);
-				wprintf("<textarea name=\"text_%s\" wrap=soft rows=20 cols=80 width=80>\n",
+				wc_printf("<div id=\"script_%s\" style=\"display:none\">\n", script_names[i]);
+				wc_printf("<textarea name=\"text_%s\" wrap=soft rows=20 cols=80 width=80>\n",
 					script_names[i]);
 				serv_printf("MSIV getscript|%s", script_names[i]);
 				serv_getln(buf, sizeof buf);
 				if (buf[0] == '1') while(serv_getln(buf, sizeof (buf)), strcmp(buf, "000")) {
-					wprintf("%s\n", buf);
+					wc_printf("%s\n", buf);
 				}
-				wprintf("</textarea>\n");
-				wprintf("</div>\n");
+				wc_printf("</textarea>\n");
+				wc_printf("</div>\n");
 			}
 		}
 	}
 
-	wprintf("<script type=\"text/javascript\">	\n"
+	wc_printf("<script type=\"text/javascript\">	\n"
 		"ToggleScriptPanels();			\n"
 		"</script>				\n"
 	);
 
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 
 
 	/* The rest of this is common for all panels... */
 
-	wprintf("<div align=\"center\"><br>");
-	wprintf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
-	wprintf("</div></form>\n");
+	wc_printf("<div align=\"center\"><br>");
+	wc_printf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+	wc_printf("</div></form>\n");
 
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</td></tr></table></div>\n");
 
-	wprintf("<script type=\"text/javascript\">	\n"
+	wc_printf("<script type=\"text/javascript\">	\n"
 		"ToggleSievePanels();			\n"
 		"</script>				\n"
 	);
@@ -643,31 +643,31 @@ void display_add_remove_scripts(char *message)
 	char script_name[256];
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<img src=\"static/advanpage2_48x.gif\">");
-	wprintf(_("Add or delete scripts"));
-	wprintf("</h1>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+	wc_printf(_("Add or delete scripts"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
 	
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
 	if (message != NULL) {
-		wprintf("%s", message);
+		wc_printf("%s", message);
 	}
 
-	wprintf("<table border=0 cellspacing=10><tr valign=top><td>\n");
+	wc_printf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
 	svput("BOXTITLE", WCS_STRING, _("Add a new script"));
 	do_template("beginboxx", NULL);
 
-	wprintf(_("To create a new script, enter the desired "
+	wc_printf(_("To create a new script, enter the desired "
 		"script name in the box below and click 'Create'."));
-	wprintf("<br /><br />");
+	wc_printf("<br /><br />");
 
-        wprintf("<center><form method=\"POST\" action=\"create_script\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-        wprintf(_("Script name: "));
-        wprintf("<input type=\"text\" name=\"script_name\"><br />\n"
+        wc_printf("<center><form method=\"POST\" action=\"create_script\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wc_printf(_("Script name: "));
+        wc_printf("<input type=\"text\" name=\"script_name\"><br />\n"
         	"<input type=\"submit\" name=\"create_button\" value=\"%s\">"
 		"</form></center>\n", _("Create"));
 
@@ -675,24 +675,24 @@ void display_add_remove_scripts(char *message)
 
 	svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
 	do_template("beginboxx", NULL);
-	wprintf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
+	wc_printf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
 		_("Return to the script editing screen")
 	);
 	do_template("endbox", NULL);
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 
 	svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
 	do_template("beginboxx", NULL);
 
-	wprintf(_("To delete an existing script, select the script "
+	wc_printf(_("To delete an existing script, select the script "
 		"name from the list and click 'Delete'."));
-	wprintf("<br /><br />");
+	wc_printf("<br /><br />");
 	
-        wprintf("<center>"
+        wc_printf("<center>"
 		"<form method=\"POST\" action=\"delete_script\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-        wprintf("<select name=\"script_name\" size=10 style=\"width:100%%\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wc_printf("<select name=\"script_name\" size=10 style=\"width:100%%\">\n");
 
         serv_puts("MSIV listscripts");
         serv_getln(buf, sizeof buf);
@@ -700,20 +700,20 @@ void display_add_remove_scripts(char *message)
                 while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                         extract_token(script_name, buf, 0, '|', sizeof script_name);
 			if ( (extract_int(buf, 1) == 0) && (strcasecmp(script_name, RULES_SCRIPT)) ) {
-                        	wprintf("<option>");
+                        	wc_printf("<option>");
                         	escputs(script_name);
-                        	wprintf("</option>\n");
+                        	wc_printf("</option>\n");
 			}
                 }
         }
-        wprintf("</select><br />\n");
+        wc_printf("</select><br />\n");
 
-        wprintf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
+        wc_printf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
 		"onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
-        wprintf("</form></center>\n");
+        wc_printf("</form></center>\n");
 	do_template("endbox", NULL);
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
 	wDumpContent(1);
 }
@@ -820,7 +820,7 @@ void display_rules_editor_inner_div(void) {
  * This script should get called by every onChange event...
  *
  */
-	wprintf("<script type=\"text/javascript\">					\n"
+	wc_printf("<script type=\"text/javascript\">					\n"
 		"									\n"
 		"var highest_active_rule = (-1);					\n"
 		"									\n"
@@ -828,9 +828,9 @@ void display_rules_editor_inner_div(void) {
 /*
  * Show only the active rows...
  */
-	wprintf("  highest_active_rule = (-1);						\n");
-	wprintf("  for (i=0; i<%d; ++i) {						\n", MAX_RULES);
-	wprintf("   if ($('active'+i).checked) {					\n"
+	wc_printf("  highest_active_rule = (-1);						\n");
+	wc_printf("  for (i=0; i<%d; ++i) {						\n", MAX_RULES);
+	wc_printf("   if ($('active'+i).checked) {					\n"
 		"     $('rule' + i).style.display = 'block';				\n"
 		"     highest_active_rule = i;						\n"
 		"   }									\n"
@@ -841,7 +841,7 @@ void display_rules_editor_inner_div(void) {
 /*
  * Show only the fields relevant to the rules...
  */
-	wprintf("  for (i=0; i<=highest_active_rule; ++i) {				\n"
+	wc_printf("  for (i=0; i<=highest_active_rule; ++i) {				\n"
 		"    d = ($('movedown'+i));						\n"
 		"    if (i < highest_active_rule) {					\n"
 		"      d.style.display = 'block';					\n"
@@ -884,7 +884,7 @@ void display_rules_editor_inner_div(void) {
 		"      $('div_automsg'+i).style.display = 'none';			\n"
 		"    }									\n"
 		"    if (highest_active_rule < %d) {					\n", MAX_RULES-1 );
-	wprintf("      $('div_addrule').style.display = 'block';			\n"
+	wc_printf("      $('div_addrule').style.display = 'block';			\n"
 		"    } else {								\n"
 		"      $('div_addrule').style.display = 'none';				\n"
 		"    }									\n"
@@ -934,9 +934,9 @@ void display_rules_editor_inner_div(void) {
 	);
 
 
-	wprintf("<br />");
+	wc_printf("<br />");
 
-	wprintf("<table cellpadding=2 width=100%%>");
+	wc_printf("<table cellpadding=2 width=100%%>");
 
 	for (i=0; i<MAX_RULES; ++i) {
 
@@ -955,42 +955,42 @@ void display_rules_editor_inner_div(void) {
 		
 		/* now generate the table row */
 
-		wprintf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
+		wc_printf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
 			i,
 			((i%2) ? "DDDDDD" : "FFFFFF")
 		);
 
-		wprintf("<td width=5%% align=\"center\">");
+		wc_printf("<td width=5%% align=\"center\">");
 
-		wprintf("<div style=\"display:none\">");
-		wprintf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>",
+		wc_printf("<div style=\"display:none\">");
+		wc_printf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>",
 			i, i,
 			(active ? "checked" : "")
 		);
-		wprintf("</div>");
+		wc_printf("</div>");
 
-		if (i>0) wprintf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
+		if (i>0) wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
 			"<img border=\"0\" src=\"static/up_pointer.gif\" "
 			"title=\"%s\"/></a>",
 			i-1, i, _("Move rule up") );
 
-		wprintf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
+		wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
 			"<img id=\"movedown%d\" border=\"0\" src=\"static/down_pointer.gif\" "
 			"title=\"%s\"/></a>",
 			i, i+1, i, _("Move rule down") );
 
-		wprintf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
+		wc_printf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
 			"<img id=\"delete%d\" border=\"0\" src=\"static/delete.gif\" "
 			"title=\"%s\"/></a>",
 			i, i, _("Delete rule") );
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
-		wprintf("<td width=5%% align=\"center\">");
-		wprintf("<font size=+2>%d</font>", i+1);
-		wprintf("</td>");
+		wc_printf("<td width=5%% align=\"center\">");
+		wc_printf("<font size=+2>%d</font>", i+1);
+		wc_printf("</td>");
 
-		wprintf("<td width=20%%>%s ", _("If") );
+		wc_printf("<td width=20%%>%s ", _("If") );
 
 		char *hfield_values[15][2] = {
 			{	"from",		_("From")		},
@@ -1010,20 +1010,20 @@ void display_rules_editor_inner_div(void) {
 			{	"all",		_("All")		}
 		};
 
-		wprintf("<select id=\"hfield%d\" name=\"hfield%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<select id=\"hfield%d\" name=\"hfield%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<15; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(hfield, hfield_values[j][0])) ? "selected" : ""),
 				hfield_values[j][0],
 				hfield_values[j][1]
 			);
 		}
 
-		wprintf("</select>");
-		wprintf("</td>");
+		wc_printf("</select>");
+		wc_printf("</td>");
 
-		wprintf("<td width=20%%>");
+		wc_printf("<td width=20%%>");
 
 		char *compare_values[6][2] = {
 			{	"contains",	_("contains")		},
@@ -1034,49 +1034,49 @@ void display_rules_editor_inner_div(void) {
 			{	"notmatches",	_("does not match")	}
 		};
 
-		wprintf("<div id=\"div_compare%d\">", i);
-		wprintf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<div id=\"div_compare%d\">", i);
+		wc_printf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<6; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
 				compare_values[j][0],
 				compare_values[j][1]
 			);
 		}
-		wprintf("</select>");
+		wc_printf("</select>");
 
-		wprintf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\" value=\"", i, i);
+		wc_printf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\" value=\"", i, i);
 		escputs(htext);
-		wprintf("\"></div>");
+		wc_printf("\"></div>");
 
-		wprintf("<div id=\"div_nocompare%d\">", i);
-		wprintf("%s", _("(All messages)"));
-		wprintf("</div>");
+		wc_printf("<div id=\"div_nocompare%d\">", i);
+		wc_printf("%s", _("(All messages)"));
+		wc_printf("</div>");
 
 		char *sizecomp_values[2][2] = {
 			{	"larger",	_("is larger than")	},
 			{	"smaller",	_("is smaller than")	}
 		};
 
-		wprintf("<div id=\"div_size%d\">", i);
-		wprintf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<div id=\"div_size%d\">", i);
+		wc_printf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<2; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(sizecomp, sizecomp_values[j][0])) ? "selected" : ""),
 				sizecomp_values[j][0],
 				sizecomp_values[j][1]
 			);
 		}
-		wprintf("</select>");
+		wc_printf("</select>");
 
-		wprintf("<input type=\"text\" id=\"sizeval%d\" name=\"sizeval%d\" value=\"%d\">",
+		wc_printf("<input type=\"text\" id=\"sizeval%d\" name=\"sizeval%d\" value=\"%d\">",
 			i, i, sizeval);
-		wprintf("bytes");
-		wprintf("</div>");
+		wc_printf("bytes");
+		wc_printf("</div>");
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
 		char *action_values[6][2] = {
 			{	"keep",		_("Keep")		},
@@ -1087,81 +1087,81 @@ void display_rules_editor_inner_div(void) {
 			{	"vacation",	_("Vacation")		}
 		};
 
-		wprintf("<td width=20%%>");
-		wprintf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<td width=20%%>");
+		wc_printf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<6; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(action, action_values[j][0])) ? "selected" : ""),
 				action_values[j][0],
 				action_values[j][1]
 			);
 		}
-		wprintf("</select>");
+		wc_printf("</select>");
 
-		wprintf("<div id=\"div_fileinto%d\">", i);
-		wprintf("<select name=\"fileinto%d\" id=\"fileinto%d\">", i, i);
+		wc_printf("<div id=\"div_fileinto%d\">", i);
+		wc_printf("<select name=\"fileinto%d\" id=\"fileinto%d\">", i, i);
 		for (j=0; j<num_roomnames; ++j) {
-			wprintf("<option ");
+			wc_printf("<option ");
 			if (!strcasecmp(rooms[j].name, fileinto)) {
-				wprintf("selected ");
+				wc_printf("selected ");
 			}
-			wprintf("value=\"");
+			wc_printf("value=\"");
 			escputs(rooms[j].name);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs(rooms[j].name);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
-		wprintf("</select>\n");
-		wprintf("</div>");
+		wc_printf("</select>\n");
+		wc_printf("</div>");
 
-		wprintf("<div id=\"div_redirect%d\">", i);
-		wprintf("<input type=\"text\" id=\"redirect%d\" name=\"redirect%d\" value=\"", i, i);
+		wc_printf("<div id=\"div_redirect%d\">", i);
+		wc_printf("<input type=\"text\" id=\"redirect%d\" name=\"redirect%d\" value=\"", i, i);
 		escputs(redirect);
-		wprintf("\"></div>");
+		wc_printf("\"></div>");
 
-		wprintf("<div id=\"div_automsg%d\">", i);
-		wprintf(_("Message:"));
-		wprintf("<br />");
-		wprintf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
+		wc_printf("<div id=\"div_automsg%d\">", i);
+		wc_printf(_("Message:"));
+		wc_printf("<br />");
+		wc_printf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
 		escputs(automsg);
-		wprintf("</textarea>");
-		wprintf("</div>");
+		wc_printf("</textarea>");
+		wc_printf("</div>");
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
 		char *final_values[2][2] = {
 			{	"continue",	_("continue processing")	},
 			{	"stop",		_("stop")			}
 		};
 
-		wprintf("<td width=10%% align=\"center\">%s</td>", _("and then") );
+		wc_printf("<td width=10%% align=\"center\">%s</td>", _("and then") );
 
-		wprintf("<td width=20%%>");
-		wprintf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<td width=20%%>");
+		wc_printf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<2; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(final, final_values[j][0])) ? "selected" : ""),
 				final_values[j][0],
 				final_values[j][1]
 			);
 		}
-		wprintf("</select>");
-		wprintf("</td>");
+		wc_printf("</select>");
+		wc_printf("</td>");
 
-		wprintf("</tr>\n");
+		wc_printf("</tr>\n");
 
 	}
 
-	wprintf("</table>");
-	wprintf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
+	wc_printf("</table>");
+	wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
 		_("Add rule")
 	);
 
-	wprintf("<script type=\"text/javascript\">					\n");
-	wprintf("UpdateRules();								\n");
-	wprintf("</script>								\n");
+	wc_printf("<script type=\"text/javascript\">					\n");
+	wc_printf("UpdateRules();								\n");
+	wc_printf("</script>								\n");
 
 	free(rooms);
 }
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index 5a0ced4fd..16ae09ae1 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -129,36 +129,36 @@ void display_queue_msg(long msgnum)
 
 	}
 
-	wprintf("<tr><td>");
-	wprintf("%ld<br />", msgnum);
-	wprintf(" <a href=\"javascript:DeleteSMTPqueueMsg(%ld,%ld);\">%s</a>", 
+	wc_printf("<tr><td>");
+	wc_printf("%ld<br />", msgnum);
+	wc_printf(" <a href=\"javascript:DeleteSMTPqueueMsg(%ld,%ld);\">%s</a>", 
 		msgnum, msgid, _("(Delete)")
 	);
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 	if (submitted > 0) {
 		webcit_fmt_date(buf, 1024, submitted, 1);
-		wprintf("%s", buf);
+		wc_printf("%s", buf);
 	}
 	else {
-		wprintf("&nbsp;");
+		wc_printf("&nbsp;");
 	}
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 	if (last_attempt > 0) {
 		webcit_fmt_date(buf, 1024, last_attempt, 1);
-		wprintf("%s", buf);
+		wc_printf("%s", buf);
 	}
 	else {
-		wprintf("&nbsp;");
+		wc_printf("&nbsp;");
 	}
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 	escputs(sender);
 
-	wprintf("</td><td>");
-	wprintf("%s", recipients);
-	wprintf("</td></tr>\n");
+	wc_printf("</td><td>");
+	wc_printf("%s", recipients);
+	wc_printf("</td></tr>\n");
 
 }
 
@@ -185,21 +185,21 @@ void display_smtpqueue_inner_div(void) {
 		Stat.highest_found = (-1);
 		num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
 		if (num_msgs > 0) {
-                        wprintf("<table class=\"mailbox_summary\" rules=rows "
+                        wc_printf("<table class=\"mailbox_summary\" rules=rows "
                         	"cellpadding=2 style=\"width:100%%;\">"
 			);
 
-			wprintf("<tr><td><b><i>");
-			wprintf(_("Message ID"));
-			wprintf("</i></b></td><td><b><i>");
-			wprintf(_("Date/time submitted"));
-			wprintf("</i></b></td><td><b><i>");
-			wprintf(_("Last attempt"));
-			wprintf("</i></b></td><td><b><i>");
-			wprintf(_("Sender"));
-			wprintf("</i></b></td><td><b><i>");
-			wprintf(_("Recipients"));
-			wprintf("</i></b></td></tr>\n");
+			wc_printf("<tr><td><b><i>");
+			wc_printf(_("Message ID"));
+			wc_printf("</i></b></td><td><b><i>");
+			wc_printf(_("Date/time submitted"));
+			wc_printf("</i></b></td><td><b><i>");
+			wc_printf(_("Last attempt"));
+			wc_printf("</i></b></td><td><b><i>");
+			wc_printf(_("Sender"));
+			wc_printf("</i></b></td><td><b><i>");
+			wc_printf(_("Recipients"));
+			wc_printf("</i></b></td></tr>\n");
 
 			for (i=0; i<num_msgs; ++i) {
 				Msg = GetMessagePtrAt(i, WCC->summ);
@@ -208,19 +208,19 @@ void display_smtpqueue_inner_div(void) {
 				}
 			}
 
-			wprintf("</table>");
+			wc_printf("</table>");
 
 		}
 		else {
-			wprintf("<br /><br /><div align=\"center\">");
-			wprintf(_("The queue is empty."));
-			wprintf("</div><br /><br />");
+			wc_printf("<br /><br /><div align=\"center\">");
+			wc_printf(_("The queue is empty."));
+			wc_printf("</div><br /><br />");
 		}
 	}
 	else {
-		wprintf("<br /><br /><div align=\"center\">");
-		wprintf(_("You do not have permission to view this resource."));
-		wprintf("</div><br /><br />");
+		wc_printf("<br /><br /><div align=\"center\">");
+		wc_printf(_("You do not have permission to view this resource."));
+		wc_printf("</div><br /><br />");
 	}
 	output_headers(0, 0, 0, 0, 0, 0);
 	end_burst();
@@ -233,19 +233,19 @@ void display_smtpqueue(void)
 {
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("View the outbound SMTP queue"));
-	wprintf("</h1>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
+	wc_printf(_("View the outbound SMTP queue"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"smtpqueue_background\">"
 		"<tr><td valign=top>\n");
 
-	wprintf("<div id=\"smtpqueue_inner_div\">"
+	wc_printf("<div id=\"smtpqueue_inner_div\">"
 		"<div align=\"center\"><img src=\"static/throbber.gif\"></div>"
 		"</div>"
 		"<div align=\"center\">"
diff --git a/webcit/static.c b/webcit/static.c
index 461f3abbf..70f3cd36b 100644
--- a/webcit/static.c
+++ b/webcit/static.c
@@ -26,7 +26,7 @@ HashList *StaticFilemappings[4] = {NULL, NULL, NULL, NULL};
 			lprintf(9, "Suspicious request. Ignoring.");
 			hprintf("HTTP/1.1 404 Security check failed\r\n");
 			hprintf("Content-Type: text/plain\r\n\r\n");
-			wprintf("You have sent a malformed or invalid request.\r\n");
+			wc_printf("You have sent a malformed or invalid request.\r\n");
 			end_burst();
 		}
 */
@@ -49,7 +49,7 @@ void output_static(const char *what)
 		hprintf("HTTP/1.1 404 %s\r\n", strerror(errno));
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf("Cannot open %s: %s\r\n", what, strerror(errno));
+		wc_printf("Cannot open %s: %s\r\n", what, strerror(errno));
 		end_burst();
 	} else {
 		len = strlen (what);
@@ -60,7 +60,7 @@ void output_static(const char *what)
 			hprintf("HTTP/1.1 404 %s\r\n", strerror(errno));
 			hprintf("Content-Type: text/plain\r\n");
 			begin_burst();
-			wprintf("Cannot fstat %s: %s\n", what, strerror(errno));
+			wc_printf("Cannot fstat %s: %s\n", what, strerror(errno));
 			end_burst();
 			return;
 		}
diff --git a/webcit/summary.c b/webcit/summary.c
index a5db298b0..208169eb1 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -19,7 +19,7 @@ void output_date(void) {
 	localtime_r(&now, &tm);
 
 	wc_strftime(buf, 32, "%A, %x", &tm);
-	wprintf("%s", buf);
+	wc_printf("%s", buf);
 }
 
 
@@ -31,7 +31,7 @@ void output_date(void) {
 void dummy_section(void) {
 	svput("BOXTITLE", WCS_STRING, "(dummy&nbsp;section)");
 	do_template("beginboxx", NULL);
-	wprintf(_("(nothing)"));
+	wc_printf(_("(nothing)"));
 	do_template("endbox", NULL);
 }
 
@@ -50,7 +50,7 @@ void new_messages_section(void) {
 	number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
 	if (number_of_rooms_to_check == 0) return;
 
-	wprintf("<table border=0 width=100%%>\n");
+	wc_printf("<table border=0 width=100%%>\n");
 	for (i=0; i<number_of_rooms_to_check; ++i) {
 		extract_token(room, rooms_to_check, i, '|', sizeof room);
 
@@ -58,17 +58,17 @@ void new_messages_section(void) {
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
 			extract_token(room, &buf[4], 0, '|', sizeof room);
-			wprintf("<tr><td><a href=\"dotgoto?room=");
+			wc_printf("<tr><td><a href=\"dotgoto?room=");
 			urlescputs(room);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs(room);
-			wprintf("</a></td><td>%d/%d</td></tr>\n",
+			wc_printf("</a></td><td>%d/%d</td></tr>\n",
 				extract_int(&buf[4], 1),
 				extract_int(&buf[4], 2)
 			);
 		}
 	}
-	wprintf("</table>\n");
+	wc_printf("</table>\n");
 
 }
 
@@ -112,9 +112,9 @@ void tasks_section(void) {
 	}
 
 	if (calendar_summary_view() < 1) {
-		wprintf("<i>");
-		wprintf(_("(None)"));
-		wprintf("</i><br />\n");
+		wc_printf("<i>");
+		wc_printf(_("(None)"));
+		wc_printf("</i><br />\n");
 	}
 }
 
@@ -164,9 +164,9 @@ void calendar_section(void) {
 		DeleteHashPos(&at);
 	}
 	if (calendar_summary_view() < 1) {
-		wprintf("<i>");
-		wprintf(_("(Nothing)"));
-		wprintf("</i><br />\n");
+		wc_printf("<i>");
+		wc_printf(_("(Nothing)"));
+		wc_printf("</i><br />\n");
 	}
 	__calendar_Cleanup(&v);
 }
@@ -197,82 +197,82 @@ void server_info_section(void) {
  * not people I consider worthwhile, I still want them to use WebCit.
  */
 void summary_inner_div(void) {
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
 		"<tr valign=top>");
 
 	/*
 	 * Column One
 	 */
-	wprintf("<td width=33%%>");
-	wprintf("<div class=\"box\">");	
-	wprintf("<div class=\"boxlabel\">");	
-	wprintf(_("Messages"));
-	wprintf("</div><div class=\"boxcontent\">");	
-	wprintf("<div id=\"msg_inner\">");	
+	wc_printf("<td width=33%%>");
+	wc_printf("<div class=\"box\">");	
+	wc_printf("<div class=\"boxlabel\">");	
+	wc_printf(_("Messages"));
+	wc_printf("</div><div class=\"boxcontent\">");	
+	wc_printf("<div id=\"msg_inner\">");	
 	new_messages_section();
-	wprintf("</div></div></div>");
-	wprintf("</td>");
+	wc_printf("</div></div></div>");
+	wc_printf("</td>");
 
 	/*
 	 * Column Two 
 	 */
-	wprintf("<td width=33%%>");
-	wprintf("<div class=\"box\">");	
-	wprintf("<div class=\"boxlabel\">");	
-	wprintf(_("Tasks"));
-	wprintf("</div><div class=\"boxcontent\">");	
-	wprintf("<div id=\"tasks_inner\">");	
+	wc_printf("<td width=33%%>");
+	wc_printf("<div class=\"box\">");	
+	wc_printf("<div class=\"boxlabel\">");	
+	wc_printf(_("Tasks"));
+	wc_printf("</div><div class=\"boxcontent\">");	
+	wc_printf("<div id=\"tasks_inner\">");	
 	tasks_section();
-	wprintf("</div></div></div>");
-	wprintf("</td>");
+	wc_printf("</div></div></div>");
+	wc_printf("</td>");
 
 	/*
 	 * Column Three
 	 */
-	wprintf("<td width=33%%>");
-	wprintf("<div class=\"box\">");	
-	wprintf("<div class=\"boxlabel\">");	
-	wprintf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
-	wprintf("</div><div class=\"boxcontent\">");	
-	wprintf("<div id=\"calendar_inner\">");	
+	wc_printf("<td width=33%%>");
+	wc_printf("<div class=\"box\">");	
+	wc_printf("<div class=\"boxlabel\">");	
+	wc_printf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
+	wc_printf("</div><div class=\"boxcontent\">");	
+	wc_printf("<div id=\"calendar_inner\">");	
 	calendar_section();
-	wprintf("</div></div></div>");
-	wprintf("</td>");
+	wc_printf("</div></div></div>");
+	wc_printf("</td>");
 
-	wprintf("</tr><tr valign=top>");
+	wc_printf("</tr><tr valign=top>");
 
 	/*
 	 * Row Two - Column One
 	 */
-	wprintf("<td colspan=2>");
-	wprintf("<div class=\"box\">");	
-	wprintf("<div class=\"boxlabel\">");	
-	wprintf(_("Who's&nbsp;online&nbsp;now"));
-	wprintf("</div><div class=\"boxcontent\">");	
-	wprintf("<div id=\"who_inner\">");	
+	wc_printf("<td colspan=2>");
+	wc_printf("<div class=\"box\">");	
+	wc_printf("<div class=\"boxlabel\">");	
+	wc_printf(_("Who's&nbsp;online&nbsp;now"));
+	wc_printf("</div><div class=\"boxcontent\">");	
+	wc_printf("<div id=\"who_inner\">");	
 	do_template("wholistsummarysection", NULL);
-	wprintf("</div></div></div>");
-	wprintf("</td>");
+	wc_printf("</div></div></div>");
+	wc_printf("</td>");
 
 	/*
 	 * Row Two - Column Two
 	 */
-	wprintf("<td width=33%%>");
-	wprintf("<div class=\"box\">");	
-	wprintf("<div class=\"boxlabel\">");	
-	wprintf(_("About&nbsp;this&nbsp;server"));
-	wprintf("</div><div class=\"boxcontent\">");	
-	wprintf("<div id=\"info_inner\">");	
+	wc_printf("<td width=33%%>");
+	wc_printf("<div class=\"box\">");	
+	wc_printf("<div class=\"boxlabel\">");	
+	wc_printf(_("About&nbsp;this&nbsp;server"));
+	wc_printf("</div><div class=\"boxcontent\">");	
+	wc_printf("<div id=\"info_inner\">");	
 	server_info_section();
-	wprintf("</div></div></div>");
-	wprintf("</td>");
+	wc_printf("</div></div></div>");
+	wc_printf("</td>");
 
 
 	/*
 	 * End of columns
 	 */
-	wprintf("</tr></table>");
+	wc_printf("</tr></table>");
 }
 
 
@@ -283,33 +283,33 @@ void summary(void) {
 	char title[256];
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<div class=\"room_banner\">");
-        wprintf("<img src=\"static/summscreen_48x.gif\">");
-        wprintf("<h1>");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<div class=\"room_banner\">");
+        wc_printf("<img src=\"static/summscreen_48x.gif\">");
+        wc_printf("<h1>");
         snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
         escputs(title);
-        wprintf("</h1><h2>");
+        wc_printf("</h1><h2>");
         output_date();
-        wprintf("</h2></div>");
-	wprintf("<div id=\"actiondiv\">");
-	wprintf("<ul class=\"room_actions\">\n");
-	wprintf("<li class=\"start_page\">");
+        wc_printf("</h2></div>");
+	wc_printf("<div id=\"actiondiv\">");
+	wc_printf("<ul class=\"room_actions\">\n");
+	wc_printf("<li class=\"start_page\">");
 	offer_start_page(NULL, &NoCtx);
-        wprintf("</li></ul>");
-        wprintf("</div>");
-        wprintf("</div>");
+        wc_printf("</li></ul>");
+        wc_printf("</div>");
+        wc_printf("</div>");
 
 	/*
 	 * You guessed it ... we're going to refresh using ajax.
 	 * In the future we might consider updating individual sections of the summary
 	 * instead of the whole thing.
 	 */
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 	summary_inner_div();
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 
-	wprintf(
+	wc_printf(
 		"<script type=\"text/javascript\">					"
 		" new Ajax.PeriodicalUpdater('msg_inner', 'new_messages_html',		"
 		"                            { method: 'get', frequency: 60 }  );	"
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 564645d48..f35097eb3 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -35,22 +35,22 @@ void display_edit(char *description, char *check_cmd,
 	svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Edit %s"), description);
 	do_template("beginboxx", NULL);
 
-	wprintf(_("Enter %s below. Text is formatted to the reader's browser."
+	wc_printf(_("Enter %s below. Text is formatted to the reader's browser."
 		" A newline is forced by preceding the next line by a blank."), description);
 
-	wprintf("<form method=\"post\" action=\"%s\">\n", save_cmd);
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<textarea name=\"msgtext\" wrap=soft "
+	wc_printf("<form method=\"post\" action=\"%s\">\n", save_cmd);
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<textarea name=\"msgtext\" wrap=soft "
 		"rows=10 cols=80 width=80>\n");
 	serv_puts(read_cmd);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1')
 		server_to_text();
-	wprintf("</textarea><div class=\"buttons\" >\n");
-	wprintf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
-	wprintf("</div></form>\n");
+	wc_printf("</textarea><div class=\"buttons\" >\n");
+	wc_printf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
+	wc_printf("&nbsp;");
+	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+	wc_printf("</div></form>\n");
 
 	do_template("endbox", NULL);
 	wDumpContent(1);
diff --git a/webcit/tabs.c b/webcit/tabs.c
index a0cb7a6eb..2adaaec9a 100644
--- a/webcit/tabs.c
+++ b/webcit/tabs.c
@@ -26,25 +26,25 @@ void tabbed_dialog(int num_tabs, char *tabnames[]) {
 		"}										\n"
 	);
 
-	wprintf("<table id=\"TheTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
+	wc_printf("<table id=\"TheTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
 		"<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
 	);
 
 	for (i=0; i<num_tabs; ++i) {
-		wprintf("<td id=\"tabtd%d\" class=\"%s\" "
+		wc_printf("<td id=\"tabtd%d\" class=\"%s\" "
 			"onClick='tabsel(\"%d\");'"
 			">",
 			i,
 			( (i==0) ? "tab_cell_label" : "tab_cell_edit" ),
 			i
 			);
-		wprintf("%s", tabnames[i]);
-		wprintf("</td>");
+		wc_printf("%s", tabnames[i]);
+		wc_printf("</td>");
 
-		wprintf("<td>&nbsp;</td>\n");
+		wc_printf("<td>&nbsp;</td>\n");
 	}
 
-	wprintf("</tr></table>\n");
+	wc_printf("</tr></table>\n");
 }
 
 /*
@@ -57,13 +57,13 @@ void tabbed_dialog(int num_tabs, char *tabnames[]) {
 void begin_tab(int tabnum, int num_tabs) {
 
 	if (tabnum == num_tabs) {
-		wprintf("<!-- begin tab-common epilogue -->\n");
-		wprintf("<div class=\"tabcontent_submit\">");
+		wc_printf("<!-- begin tab-common epilogue -->\n");
+		wc_printf("<div class=\"tabcontent_submit\">");
 	}
 
 	else {
-		wprintf("<!-- begin tab %d of %d -->\n", tabnum, num_tabs);
-		wprintf("<div id=\"tabdiv%d\" style=\"display:%s\" class=\"tabcontent\" >",
+		wc_printf("<!-- begin tab %d of %d -->\n", tabnum, num_tabs);
+		wc_printf("<div id=\"tabdiv%d\" style=\"display:%s\" class=\"tabcontent\" >",
 			tabnum,
 			( (tabnum == 0) ? "block" : "none" )
 		);
@@ -79,16 +79,16 @@ void begin_tab(int tabnum, int num_tabs) {
 void end_tab(int tabnum, int num_tabs) {
 
 	if (tabnum == num_tabs) {
-		wprintf("</div> <!-- end of 'tabcontent_submit' div -->\n");
-		wprintf("<!-- end tab-common epilogue -->\n");
+		wc_printf("</div> <!-- end of 'tabcontent_submit' div -->\n");
+		wc_printf("<!-- end tab-common epilogue -->\n");
 	}
 
 	else {
-		wprintf("</div>\n");
-		wprintf("<!-- end tab %d of %d -->\n", tabnum, num_tabs);
+		wc_printf("</div>\n");
+		wc_printf("<!-- end tab %d of %d -->\n", tabnum, num_tabs);
 	
 		if (tabnum == num_tabs-1) {
-			wprintf("<script type=\"text/javascript\">"
+			wc_printf("<script type=\"text/javascript\">"
 				" Nifty(\"table#TheTabs td\", \"small transparent top\");"
 				"</script>"
 			);
diff --git a/webcit/tasks.c b/webcit/tasks.c
index 2f9f16e05..7b9552e86 100644
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -89,17 +89,17 @@ int tasks_RenderView_or_Tail(SharedMessageStatus *Stat,
 	icalproperty *p;
 	wcsession *WCC = WC;
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"calendar_view_background\"><tbody id=\"taskview\">\n<tr>\n"
 		"<th>");
-	wprintf(_("Completed?"));
-	wprintf("</th><th>");
-	wprintf(_("Name of task"));
-	wprintf("</th><th>");
-	wprintf(_("Date due"));
-	wprintf("</th><th>");
-	wprintf(_("Category"));
-	wprintf(" (<select id=\"selectcategory\"><option value=\"showall\">%s</option></select>)</th></tr>\n",
+	wc_printf(_("Completed?"));
+	wc_printf("</th><th>");
+	wc_printf(_("Name of task"));
+	wc_printf("</th><th>");
+	wc_printf(_("Date due"));
+	wc_printf("</th><th>");
+	wc_printf(_("Category"));
+	wc_printf(" (<select id=\"selectcategory\"><option value=\"showall\">%s</option></select>)</th></tr>\n",
 		_("Show All"));
 
 	nItems = GetCount(WC->disp_cal_items);
@@ -123,47 +123,47 @@ int tasks_RenderView_or_Tail(SharedMessageStatus *Stat,
 		int is_date;
 
 		Cal = (disp_cal*)vCal;
-		wprintf("<tr><td>");
+		wc_printf("<tr><td>");
 		todoStatus = icalcomponent_get_status(Cal->cal);
-		wprintf("<input type=\"checkbox\" name=\"completed\" value=\"completed\" ");
+		wc_printf("<input type=\"checkbox\" name=\"completed\" value=\"completed\" ");
 		if (todoStatus == ICAL_STATUS_COMPLETED) {
-			wprintf("checked=\"checked\" ");
+			wc_printf("checked=\"checked\" ");
 		}
-		wprintf("disabled=\"disabled\">\n</td><td>");
+		wc_printf("disabled=\"disabled\">\n</td><td>");
 		p = icalcomponent_get_first_property(Cal->cal,
 			ICAL_SUMMARY_PROPERTY);
-		wprintf("<a href=\"display_edit_task?msgnum=%ld?taskrm=", Cal->cal_msgnum);
+		wc_printf("<a href=\"display_edit_task?msgnum=%ld?taskrm=", Cal->cal_msgnum);
 		urlescputs(ChrPtr(WC->wc_roomname));
-		wprintf("\">");
-		/* wprintf("<img align=middle "
+		wc_printf("\">");
+		/* wc_printf("<img align=middle "
 		"src=\"static/taskmanag_16x.gif\" border=0>&nbsp;"); */
 		if (p != NULL) {
 			escputs((char *)icalproperty_get_comment(p));
 		}
-		wprintf("</a>\n");
-		wprintf("</td>\n");
+		wc_printf("</a>\n");
+		wc_printf("</td>\n");
 
 		due = get_task_due_date(Cal->cal, &is_date);
-		wprintf("<td><span");
+		wc_printf("<td><span");
 		if (due > 0) {
 			webcit_fmt_date(buf, SIZ, due, is_date ? DATEFMT_RAWDATE : DATEFMT_FULL);
-			wprintf(">%s",buf);
+			wc_printf(">%s",buf);
 		}
 		else {
-			wprintf(">");
+			wc_printf(">");
 		}
-		wprintf("</span></td>");
-		wprintf("<td>");
+		wc_printf("</span></td>");
+		wc_printf("<td>");
 		p = icalcomponent_get_first_property(Cal->cal,
 			ICAL_CATEGORIES_PROPERTY);
 		if (p != NULL) {
 			escputs((char *)icalproperty_get_categories(p));
 		}
-		wprintf("</td>");
-		wprintf("</tr>");
+		wc_printf("</td>");
+		wc_printf("</tr>");
 	}
 
-	wprintf("</tbody></table></div>\n");
+	wc_printf("</tbody></table></div>\n");
 
 	/* Free the list */
 	DeleteHash(&WC->disp_cal_items);
@@ -220,55 +220,55 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch
 	
 	/* TODO: Can we take all this and move it into a template?	 */
 	output_headers(1, 1, 1, 0, 0, 0);
-	wprintf("<!-- start task edit form -->");
+	wc_printf("<!-- start task edit form -->");
 	p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
 	/* Get summary early for title */
-	wprintf("<div class=\"box\">\n");
-	wprintf("<div class=\"boxlabel\">");
-	wprintf(_("Edit task"));
-	wprintf("- ");
+	wc_printf("<div class=\"box\">\n");
+	wc_printf("<div class=\"boxlabel\">");
+	wc_printf(_("Edit task"));
+	wc_printf("- ");
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("</div>");
+	wc_printf("</div>");
 	
-	wprintf("<div class=\"boxcontent\">\n");
-	wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
-	wprintf("<div style=\"display: none;\">\n	");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n", msgnum);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to_summary\" VALUE=\"%d\">\n",
+	wc_printf("<div class=\"boxcontent\">\n");
+	wc_printf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
+	wc_printf("<div style=\"display: none;\">\n	");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n", msgnum);
+	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"return_to_summary\" VALUE=\"%d\">\n",
 		ibstr("return_to_summary"));
-	wprintf("</div>");
-	wprintf("<table class=\"calendar_background\"><tr><td>");
-	wprintf("<TABLE STYLE=\"border: none;\">\n");
+	wc_printf("</div>");
+	wc_printf("<table class=\"calendar_background\"><tr><td>");
+	wc_printf("<TABLE STYLE=\"border: none;\">\n");
 
-	wprintf("<TR><TD>");
-	wprintf(_("Summary:"));
-	wprintf("</TD><TD>"
+	wc_printf("<TR><TD>");
+	wc_printf(_("Summary:"));
+	wc_printf("</TD><TD>"
 		"<INPUT TYPE=\"text\" NAME=\"summary\" "
 		"MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
 	p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("\"></TD></TR>\n");
+	wc_printf("\"></TD></TR>\n");
 
-	wprintf("<TR><TD>");
-	wprintf(_("Start date:"));
-	wprintf("</TD><TD>");
+	wc_printf("<TR><TD>");
+	wc_printf(_("Start date:"));
+	wc_printf("</TD><TD>");
 	p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY);
-	wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodtstart\" ID=\"nodtstart\" VALUE=\"NODTSTART\" ");
+	wc_printf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodtstart\" ID=\"nodtstart\" VALUE=\"NODTSTART\" ");
 	if (p == NULL) {
-		wprintf("CHECKED=\"CHECKED\"");
+		wc_printf("CHECKED=\"CHECKED\"");
 	}
-	wprintf(">");
-	wprintf(_("No date"));
+	wc_printf(">");
+	wc_printf(_("No date"));
 	
-	wprintf(" ");
-	wprintf("<span ID=\"dtstart_date\">");
-	wprintf(_("or"));
-	wprintf(" ");
+	wc_printf(" ");
+	wc_printf("<span ID=\"dtstart_date\">");
+	wc_printf(_("or"));
+	wc_printf(" ");
 	if (p != NULL) {
 		IcalTime = icalproperty_get_dtstart(p);
 	}
@@ -276,28 +276,28 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch
 		IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone());
 	display_icaltimetype_as_webform(&IcalTime, "dtstart", 0);
 
-	wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"dtstart_time_assoc\" ID=\"dtstart_time_assoc\" VALUE=\"yes\"");
+	wc_printf("<INPUT TYPE=\"CHECKBOX\" NAME=\"dtstart_time_assoc\" ID=\"dtstart_time_assoc\" VALUE=\"yes\"");
 	if (!IcalTime.is_date) {
-		wprintf("CHECKED=\"CHECKED\"");
+		wc_printf("CHECKED=\"CHECKED\"");
 	}
-	wprintf(">");
-	wprintf(_("Time associated"));
-	wprintf("</span></TD></TR>\n");
+	wc_printf(">");
+	wc_printf(_("Time associated"));
+	wc_printf("</span></TD></TR>\n");
 
-	wprintf("<TR><TD>");
-	wprintf(_("Due date:"));
-	wprintf("</TD><TD>");
+	wc_printf("<TR><TD>");
+	wc_printf(_("Due date:"));
+	wc_printf("</TD><TD>");
 	p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
-	wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodue\" ID=\"nodue\" VALUE=\"NODUE\"");
+	wc_printf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodue\" ID=\"nodue\" VALUE=\"NODUE\"");
 	if (p == NULL) {
-		wprintf("CHECKED=\"CHECKED\"");
-	}
-	wprintf(">");
-	wprintf(_("No date"));
-	wprintf(" ");
-	wprintf("<span ID=\"due_date\">\n");
-	wprintf(_("or"));
-	wprintf(" ");
+		wc_printf("CHECKED=\"CHECKED\"");
+	}
+	wc_printf(">");
+	wc_printf(_("No date"));
+	wc_printf(" ");
+	wc_printf("<span ID=\"due_date\">\n");
+	wc_printf(_("or"));
+	wc_printf(" ");
 	if (p != NULL) {
 		IcalTime = icalproperty_get_due(p);
 	}
@@ -305,48 +305,48 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch
 		IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone());
 	display_icaltimetype_as_webform(&IcalTime, "due", 0);
 
-	wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"due_time_assoc\" ID=\"due_time_assoc\" VALUE=\"yes\"");
+	wc_printf("<INPUT TYPE=\"CHECKBOX\" NAME=\"due_time_assoc\" ID=\"due_time_assoc\" VALUE=\"yes\"");
 	if (!IcalTime.is_date) {
-		wprintf("CHECKED=\"CHECKED\"");
+		wc_printf("CHECKED=\"CHECKED\"");
 	}
-	wprintf(">");
-	wprintf(_("Time associated"));
-	wprintf("</span></TD></TR>\n");
+	wc_printf(">");
+	wc_printf(_("Time associated"));
+	wc_printf("</span></TD></TR>\n");
 	todoStatus = icalcomponent_get_status(vtodo);
-	wprintf("<TR><TD>\n");
-	wprintf(_("Completed:"));
-	wprintf("</TD><TD>");
-	wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"status\" VALUE=\"COMPLETED\"");
+	wc_printf("<TR><TD>\n");
+	wc_printf(_("Completed:"));
+	wc_printf("</TD><TD>");
+	wc_printf("<INPUT TYPE=\"CHECKBOX\" NAME=\"status\" VALUE=\"COMPLETED\"");
 	if (todoStatus == ICAL_STATUS_COMPLETED) {
-		wprintf(" CHECKED=\"CHECKED\"");
+		wc_printf(" CHECKED=\"CHECKED\"");
 	} 
-	wprintf(" >");
-	wprintf("</TD></TR>");
+	wc_printf(" >");
+	wc_printf("</TD></TR>");
 	/* start category field */
 	p = icalcomponent_get_first_property(vtodo, ICAL_CATEGORIES_PROPERTY);
-	wprintf("<TR><TD>");
-	wprintf(_("Category:"));
-	wprintf("</TD><TD>");
-	wprintf("<INPUT TYPE=\"text\" NAME=\"category\" MAXLENGTH=\"32\" SIZE=\"32\" VALUE=\"");
+	wc_printf("<TR><TD>");
+	wc_printf(_("Category:"));
+	wc_printf("</TD><TD>");
+	wc_printf("<INPUT TYPE=\"text\" NAME=\"category\" MAXLENGTH=\"32\" SIZE=\"32\" VALUE=\"");
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_categories(p));
 	}
-	wprintf("\">");
-	wprintf("</TD></TR>\n	");
+	wc_printf("\">");
+	wc_printf("</TD></TR>\n	");
 	/* end category field */
-	wprintf("<TR><TD>");
-	wprintf(_("Description:"));
-	wprintf("</TD><TD>");
-	wprintf("<TEXTAREA NAME=\"description\" "
+	wc_printf("<TR><TD>");
+	wc_printf(_("Description:"));
+	wc_printf("</TD><TD>");
+	wc_printf("<TEXTAREA NAME=\"description\" "
 		"ROWS=\"10\" COLS=\"80\">\n"
 		);
 	p = icalcomponent_get_first_property(vtodo, ICAL_DESCRIPTION_PROPERTY);
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("</TEXTAREA></TD></TR></TABLE>\n");
+	wc_printf("</TEXTAREA></TD></TR></TABLE>\n");
 
-	wprintf("<SPAN STYLE=\"text-align: center;\">"
+	wc_printf("<SPAN STYLE=\"text-align: center;\">"
 		"<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
 		"&nbsp;&nbsp;"
 		"<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
@@ -357,10 +357,10 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch
 		_("Delete"),
 		_("Cancel")
 		);
-	wprintf("</td></tr></table>");
-	wprintf("</FORM>\n");
-	wprintf("</div></div></div>\n");
-	wprintf("<!-- end task edit form -->");
+	wc_printf("</td></tr></table>");
+	wc_printf("</FORM>\n");
+	wc_printf("</div></div></div>\n");
+	wc_printf("<!-- end task edit form -->");
 	wDumpContent(1);
 
 	if (created_new_vtodo) {
diff --git a/webcit/userlist.c b/webcit/userlist.c
index 2d38610f1..d5ea48081 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -37,25 +37,25 @@ void userlist(void)
 			bio = bptr;
 		}
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<h1>");
 	snprintf(title, sizeof title, _("User list for %s"), ChrPtr(WC->serv_info->serv_humannode));
 	escputs(title);
-	wprintf("</h1>");
-        wprintf("</div>");
+	wc_printf("</h1>");
+        wc_printf("</div>");
 
-        wprintf("<div id=\"content\" class=\"service\">\n");
+        wc_printf("<div id=\"content\" class=\"service\">\n");
 
 	serv_puts("LIST");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-		wprintf("<em>%s</em><br />\n", &buf[4]);
+		wc_printf("<em>%s</em><br />\n", &buf[4]);
 		goto DONE;
 	}
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"userlist_background\"><tr><td>\n");
-	wprintf("<tr><th>%s</th><th>%s</th><th>%s</th>"
+	wc_printf("<tr><th>%s</th><th>%s</th><th>%s</th>"
 			"<th>%s</th><th>%s</th><th>%s</th></tr>",
 			_("User Name"),
 			_("Number"),
@@ -72,34 +72,34 @@ void userlist(void)
 				has_bio = 1;
 		}
 		bg = 1 - bg;
-		wprintf("<tr bgcolor=\"#%s\"><td>",
+		wc_printf("<tr bgcolor=\"#%s\"><td>",
 			(bg ? "DDDDDD" : "FFFFFF")
 		);
 		if (has_bio) {
-			wprintf("<a href=\"showuser?who=");
+			wc_printf("<a href=\"showuser?who=");
 			urlescputs(fl);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs(fl);
-			wprintf("</A>");
+			wc_printf("</A>");
 		} else {
 			escputs(fl);
 		}
-		wprintf("</td><td>%ld</td><td>%d</td><td>",
+		wc_printf("</td><td>%ld</td><td>%d</td><td>",
 			extract_long(buf, 2),
 			extract_int(buf, 1));
 		lc = extract_long(buf, 3);
 		localtime_r(&lc, &tmbuf);
-		wprintf("%02d/%02d/%04d ",
+		wc_printf("%02d/%02d/%04d ",
 			(tmbuf.tm_mon + 1),
 			tmbuf.tm_mday,
 			(tmbuf.tm_year + 1900));
 
 
-		wprintf("</td><td>%ld</td><td>%5ld</td></tr>\n",
+		wc_printf("</td><td>%ld</td><td>%5ld</td></tr>\n",
 			extract_long(buf, 4), extract_long(buf, 5));
 
 	}
-	wprintf("</table></div>\n");
+	wc_printf("</table></div>\n");
 DONE:	wDumpContent(1);
 }
 
@@ -116,16 +116,16 @@ void showuser(void)
 	strcpy(who, bstr("who"));
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<img src=\"static/usermanag_48x.gif\">");
-        wprintf("<h1>");
-	wprintf(_("User profile"));
-        wprintf("</h1>");
-        wprintf("</div>");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/usermanag_48x.gif\">");
+        wc_printf("<h1>");
+	wc_printf(_("User profile"));
+        wc_printf("</h1>");
+        wc_printf("</div>");
 
-        wprintf("<div id=\"content\" class=\"service\">\n");
+        wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"userlist_background\"><tr><td>\n");
 
 	serv_printf("OIMG _userpic_|%s", who);
@@ -138,30 +138,30 @@ void showuser(void)
 		have_pic = 0;
 	}
 
-	wprintf("<center><table><tr><td>");
+	wc_printf("<center><table><tr><td>");
 	if (have_pic == 1) {
-		wprintf("<img src=\"image?name=_userpic_&parm=");
+		wc_printf("<img src=\"image?name=_userpic_&parm=");
 		urlescputs(who);
-		wprintf("\">");
+		wc_printf("\">");
 	}
-	wprintf("</td><td><h1>");
+	wc_printf("</td><td><h1>");
 	escputs(who);
-	wprintf("</h1></td></tr></table></center>\n");
+	wc_printf("</h1></td></tr></table></center>\n");
 	serv_printf("RBIO %s", who);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
 		fmout("JUSTIFY");
 	}
-	wprintf("<br /><a href=\"display_page?recp=");
+	wc_printf("<br /><a href=\"display_page?recp=");
 	urlescputs(who);
-	wprintf("\">"
+	wc_printf("\">"
 		"<img src=\"static/citadelchat_24x.gif\" "
 		"align=middle border=0>&nbsp;&nbsp;");
 	snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
 	escputs(buf);
-	wprintf("</a>\n");
+	wc_printf("</a>\n");
 
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/utils.c b/webcit/utils.c
index b42560f53..7d6b02bdc 100644
--- a/webcit/utils.c
+++ b/webcit/utils.c
@@ -249,7 +249,7 @@ void jsescputs(char *strbuf)
 	char outbuf[SIZ];
 	
 	jsesc(outbuf, SIZ, strbuf);
-	wprintf("%s", outbuf);
+	wc_printf("%s", outbuf);
 }
 
 /*
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index b296c0fe4..787d7d51c 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -56,10 +56,10 @@ void display_addressbook(long msgnum, char alpha) {
 				|| (!strcasecmp(&(ChrPtr(WC->wc_roomname)[11]), USERCONFIGROOM))
 				|| (WC->wc_view == VIEW_ADDRESSBOOK)
 			) {
-				wprintf("<a href=\"edit_vcard?"
+				wc_printf("<a href=\"edit_vcard?"
 					"msgnum=%ld&partnum=%s\">",
 					msgnum, vcard_partnum);
-				wprintf("[%s]</a>", _("edit"));
+				wc_printf("[%s]</a>", _("edit"));
 			}
 
 			FreeStrBuf(&vcard_source);
@@ -602,9 +602,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 	char **tablabels;
 
 	if (num_ab == 0) {
-		wprintf("<br /><br /><br /><div align=\"center\"><i>");
-		wprintf(_("This address book is empty."));
-		wprintf("</i></div>\n");
+		wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+		wc_printf(_("This address book is empty."));
+		wc_printf("</i></div>\n");
 		return;
 	}
 
@@ -616,9 +616,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 
 	tablabels = malloc(num_pages * sizeof (char *));
 	if (tablabels == NULL) {
-		wprintf("<br /><br /><br /><div align=\"center\"><i>");
-		wprintf(_("An internal error has occurred."));
-		wprintf("</i></div>\n");
+		wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+		wc_printf(_("An internal error has occurred."));
+		wc_printf("</i></div>\n");
 		return;
 	}
 
@@ -640,43 +640,43 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 		if ((i / NAMESPERPAGE) != page) {	/* New tab */
 			page = (i / NAMESPERPAGE);
 			if (page > 0) {
-				wprintf("</tr></table>\n");
+				wc_printf("</tr></table>\n");
 				end_tab(page-1, num_pages);
 			}
 			begin_tab(page, num_pages);
-			wprintf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+			wc_printf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
 			displayed = 0;
 		}
 
 		if ((displayed % 4) == 0) {
 			if (displayed > 0) {
-				wprintf("</tr>\n");
+				wc_printf("</tr>\n");
 			}
 			bg = 1 - bg;
-			wprintf("<tr bgcolor=\"#%s\">",
+			wc_printf("<tr bgcolor=\"#%s\">",
 				(bg ? "DDDDDD" : "FFFFFF")
 			);
 		}
 	
-		wprintf("<td>");
+		wc_printf("<td>");
 
-		wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
+		wc_printf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
 			addrbook[i].ab_msgnum);
-		wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
+		wc_printf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
 		vcard_n_prettyize(addrbook[i].ab_name);
 		escputs(addrbook[i].ab_name);
-		wprintf("</a></td>\n");
+		wc_printf("</a></td>\n");
 		++displayed;
 	}
 
 	/* Placeholders for empty columns at end */
 	if ((num_ab % 4) != 0) {
 		for (i=0; i<(4-(num_ab % 4)); ++i) {
-			wprintf("<td>&nbsp;</td>");
+			wc_printf("<td>&nbsp;</td>");
 		}
 	}
 
-	wprintf("</tr></table>\n");
+	wc_printf("</tr></table>\n");
 	end_tab((num_pages-1), num_pages);
 
 	begin_tab(num_pages, num_pages);
@@ -874,19 +874,19 @@ void do_edit_vcard(long msgnum, char *partnum,
 	svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
 	do_template("beginboxx", NULL);
 
-	wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
 	if (force_room != NULL) {
-		wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
+		wc_printf("<input type=\"hidden\" name=\"force_room\" value=\"");
 		escputs(force_room);
-		wprintf("\">\n");
+		wc_printf("\">\n");
 	}
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
 		"<table class=\"vcard_edit_background\"><tr><td>\n");
 
-	wprintf("<table border=0><tr>"
+	wc_printf("<table border=0><tr>"
 		"<td>%s</td>"
 		"<td>%s</td>"
 		"<td>%s</td>"
@@ -894,147 +894,147 @@ void do_edit_vcard(long msgnum, char *partnum,
 		"<td>%s</td></tr>\n",
 		_("Prefix"), _("First"), _("Middle"), _("Last"), _("Suffix")
 	);
-	wprintf("<tr><td><input type=\"text\" name=\"prefix\" "
+	wc_printf("<tr><td><input type=\"text\" name=\"prefix\" "
 		"value=\"%s\" maxlength=\"5\" size=\"5\"></td>",
 		prefix);
-	wprintf("<td><input type=\"text\" name=\"firstname\" "
+	wc_printf("<td><input type=\"text\" name=\"firstname\" "
 		"value=\"%s\" maxlength=\"29\"></td>",
 		firstname);
-	wprintf("<td><input type=\"text\" name=\"middlename\" "
+	wc_printf("<td><input type=\"text\" name=\"middlename\" "
 		"value=\"%s\" maxlength=\"29\"></td>",
 		middlename);
-	wprintf("<td><input type=\"text\" name=\"lastname\" "
+	wc_printf("<td><input type=\"text\" name=\"lastname\" "
 		"value=\"%s\" maxlength=\"29\"></td>",
 		lastname);
-	wprintf("<td><input type=\"text\" name=\"suffix\" "
+	wc_printf("<td><input type=\"text\" name=\"suffix\" "
 		"value=\"%s\" maxlength=\"10\" size=\"10\"></td></tr></table>\n",
 		suffix);
 
-	wprintf("<table  class=\"vcard_edit_background_alt\">");
-	wprintf("<tr><td>");
+	wc_printf("<table  class=\"vcard_edit_background_alt\">");
+	wc_printf("<tr><td>");
 
-	wprintf(_("Display name:"));
-	wprintf("<br>"
+	wc_printf(_("Display name:"));
+	wc_printf("<br>"
 		"<input type=\"text\" name=\"fullname\" "
 		"value=\"%s\" maxlength=\"40\"><br><br>\n",
 		fullname
 	);
 
-	wprintf(_("Title:"));
-	wprintf("<br>"
+	wc_printf(_("Title:"));
+	wc_printf("<br>"
 		"<input type=\"text\" name=\"title\" "
 		"value=\"%s\" maxlength=\"40\"><br><br>\n",
 		title
 	);
 
-	wprintf(_("Organization:"));
-	wprintf("<br>"
+	wc_printf(_("Organization:"));
+	wc_printf("<br>"
 		"<input type=\"text\" name=\"org\" "
 		"value=\"%s\" maxlength=\"40\"><br><br>\n",
 		org
 	);
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 
-	wprintf("<table border=0>");
-	wprintf("<tr><td>");
-	wprintf(_("PO box:"));
-	wprintf("</td><td>"
+	wc_printf("<table border=0>");
+	wc_printf("<tr><td>");
+	wc_printf(_("PO box:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"pobox\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		pobox);
-	wprintf("<tr><td>");
-	wprintf(_("Address:"));
-	wprintf("</td><td>"
+	wc_printf("<tr><td>");
+	wc_printf(_("Address:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"extadr\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		extadr);
-	wprintf("<tr><td> </td><td>"
+	wc_printf("<tr><td> </td><td>"
 		"<input type=\"text\" name=\"street\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		street);
-	wprintf("<tr><td>");
-	wprintf(_("City:"));
-	wprintf("</td><td>"
+	wc_printf("<tr><td>");
+	wc_printf(_("City:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"city\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		city);
-	wprintf("<tr><td>");
-	wprintf(_("State:"));
-	wprintf("</td><td>"
+	wc_printf("<tr><td>");
+	wc_printf(_("State:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"state\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		state);
-	wprintf("<tr><td>");
-	wprintf(_("ZIP code:"));
-	wprintf("</td><td>"
+	wc_printf("<tr><td>");
+	wc_printf(_("ZIP code:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"zipcode\" "
 		"value=\"%s\" maxlength=\"10\"></td></tr>\n",
 		zipcode);
-	wprintf("<tr><td>");
-	wprintf(_("Country:"));
-	wprintf("</td><td>"
+	wc_printf("<tr><td>");
+	wc_printf(_("Country:"));
+	wc_printf("</td><td>"
 		"<input type=\"text\" name=\"country\" "
 		"value=\"%s\" maxlength=\"29\" width=\"5\"></td></tr>\n",
 		country);
-	wprintf("</table>\n");
+	wc_printf("</table>\n");
 
-	wprintf("</table>\n");
+	wc_printf("</table>\n");
 
-	wprintf("<table border=0><tr><td>");
-	wprintf(_("Home telephone:"));
-	wprintf("</td>"
+	wc_printf("<table border=0><tr><td>");
+	wc_printf(_("Home telephone:"));
+	wc_printf("</td>"
 		"<td><input type=\"text\" name=\"hometel\" "
 		"value=\"%s\" maxlength=\"29\"></td>\n",
 		hometel);
-	wprintf("<td>");
-	wprintf(_("Work telephone:"));
-	wprintf("</td>"
+	wc_printf("<td>");
+	wc_printf(_("Work telephone:"));
+	wc_printf("</td>"
 		"<td><input type=\"text\" name=\"worktel\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		worktel);
-	wprintf("<tr><td>");
-	wprintf(_("Mobile telephone:"));
-	wprintf("</td>"
+	wc_printf("<tr><td>");
+	wc_printf(_("Mobile telephone:"));
+	wc_printf("</td>"
 		"<td><input type=\"text\" name=\"mobiletel\" "
 		"value=\"%s\" maxlength=\"29\"></td>\n",
 		mobiletel);
-	wprintf("<td>");
-	wprintf(_("Fax number:"));
-	wprintf("</td>"
+	wc_printf("<td>");
+	wc_printf(_("Fax number:"));
+	wc_printf("</td>"
 		"<td><input type=\"text\" name=\"faxtel\" "
 		"value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
 		faxtel);
 
-	wprintf("<table class=\"vcard_edit_background_alt\">");
-	wprintf("<tr><td>");
+	wc_printf("<table class=\"vcard_edit_background_alt\">");
+	wc_printf("<tr><td>");
 
-	wprintf("<table border=0><TR>"
+	wc_printf("<table border=0><TR>"
 		"<td valign=top>");
-	wprintf(_("Primary Internet e-mail address"));
-	wprintf("<br />"
+	wc_printf(_("Primary Internet e-mail address"));
+	wc_printf("<br />"
 		"<input type=\"text\" name=\"primary_inetemail\" "
 		"size=40 maxlength=60 value=\"");
 	escputs(primary_inetemail);
-	wprintf("\"><br />"
+	wc_printf("\"><br />"
 		"</td><td valign=top>");
-	wprintf(_("Internet e-mail aliases"));
-	wprintf("<br />"
+	wc_printf(_("Internet e-mail aliases"));
+	wc_printf("<br />"
 		"<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
 	escputs(other_inetemail);
-	wprintf("</textarea></td></tr></table>\n");
+	wc_printf("</textarea></td></tr></table>\n");
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
-	wprintf("<input type=\"hidden\" name=\"extrafields\" value=\"");
+	wc_printf("<input type=\"hidden\" name=\"extrafields\" value=\"");
 	escputs(extrafields);
-	wprintf("\">\n");
+	wc_printf("\">\n");
 
-	wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
+	wc_printf("<input type=\"hidden\" name=\"return_to\" value=\"");
 	escputs(return_to);
-	wprintf("\">\n");
+	wc_printf("\">\n");
 
-	wprintf("<div class=\"buttons\">\n"
+	wc_printf("<div class=\"buttons\">\n"
 		"<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
 		"&nbsp;"
 		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
@@ -1043,7 +1043,7 @@ void do_edit_vcard(long msgnum, char *partnum,
 		_("Cancel")
 	);
 	
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 	do_template("endbox", NULL);
 	wDumpContent(1);
 	if (Msg != NULL) {
@@ -1232,7 +1232,7 @@ void display_vcard_photo_img(void)
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wprintf(_("Could Not decode vcard photo\n"));
+		wc_printf(_("Could Not decode vcard photo\n"));
 		end_burst();
 		return;
 	}
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 480dcf70c..279fc7dcf 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -51,7 +51,7 @@ void WebcitAddUrlHandler(const char * UrlString, long UrlSLen,
 /*
  * web-printing funcion. uses our vsnprintf wrapper
  */
-void wprintf(const char *format,...)
+void wc_printf(const char *format,...)
 {
 	wcsession *WCC = WC;
 	va_list arg_ptr;
@@ -89,7 +89,7 @@ void hprintf(const char *format,...)
 void wDumpContent(int print_standard_html_footer)
 {
 	if (print_standard_html_footer) {
-		wprintf("</div> <!-- end of 'content' div -->\n");
+		wc_printf("</div> <!-- end of 'content' div -->\n");
 		do_template("trailing", NULL);
 	}
 
@@ -185,10 +185,10 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers
 
 		/* check for ImportantMessages (these display in a div overlaying the main screen) */
 		if (!IsEmptyStr(WCC->ImportantMessage)) {
-			wprintf("<div id=\"important_message\">\n"
+			wc_printf("<div id=\"important_message\">\n"
 				"<span class=\"imsg\">");
 			StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
-			wprintf("</span><br />\n"
+			wc_printf("</span><br />\n"
 				"</div>\n"
 			);
 			StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -198,10 +198,10 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers
 			WCC->ImportantMessage[0] = 0;
 		}
 		else if (StrLength(WCC->ImportantMsg) > 0) {
-			wprintf("<div id=\"important_message\">\n"
+			wc_printf("<div id=\"important_message\">\n"
 				"<span class=\"imsg\">");
 			StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
-			wprintf("</span><br />\n"
+			wc_printf("</span><br />\n"
 				"</div>\n"
 			);
 			StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -215,14 +215,14 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers
 		}
 
 		if (do_room_banner == 1) {
-			wprintf("<div id=\"banner\">\n");
+			wc_printf("<div id=\"banner\">\n");
 			embed_room_banner(NULL, navbar_default);
-			wprintf("</div>\n");
+			wc_printf("</div>\n");
 		}
 	}
 
 	if (do_room_banner == 1) {
-		wprintf("<div id=\"content\">\n");
+		wc_printf("<div id=\"content\">\n");
 	}
 }
 
@@ -243,9 +243,9 @@ void http_redirect(const char *whichpage) {
 	hprintf("URI: %s\r\n", whichpage);
 	hprintf("Content-type: text/html; charset=utf-8\r\n");
 	begin_burst();
-	wprintf("<html><body>");
-	wprintf("Go <a href=\"%s\">here</A>.", whichpage);
-	wprintf("</body></html>\n");
+	wc_printf("<html><body>");
+	wc_printf("Go <a href=\"%s\">here</A>.", whichpage);
+	wc_printf("</body></html>\n");
 	end_burst();
 }
 
@@ -286,14 +286,14 @@ void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const
 {
 	hprintf("HTTP/1.1 200 OK\n");
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
-	wprintf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
-	wprintf("</td></tr></table>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
+	wc_printf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
+	wc_printf("</td></tr></table>\n");
+	wc_printf("</div>\n<div id=\"content\">\n");
 	escputs(messagetext);
 
-	wprintf("<hr />\n");
+	wc_printf("<hr />\n");
 	wDumpContent(1);
 }
 
@@ -347,9 +347,9 @@ void authorization_required(void)
 	hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode));
 	hprintf("Content-Type: text/html\r\n");
 	begin_burst();
-	wprintf("<h1>");
-	wprintf(_("Authorization Required"));
-	wprintf("</h1>\r\n");
+	wc_printf("<h1>");
+	wc_printf(_("Authorization Required"));
+	wc_printf("</h1>\r\n");
 	
 
 	if (WCC->ImportantMsg != NULL)
@@ -357,7 +357,7 @@ void authorization_required(void)
 	else if (WCC->ImportantMessage != NULL)
 		message = WCC->ImportantMessage;
 
-	wprintf(_("The resource you requested requires a valid username and password. "
+	wc_printf(_("The resource you requested requires a valid username and password. "
 		"You could not be logged in: %s\n"), message);
 	wDumpContent(0);
 	end_webcit_session();
@@ -466,17 +466,17 @@ void seconds_since_last_gexp(void)
 	char buf[256];
 
 	if ( (time(NULL) - WC->last_pager_check) < 30) {
-		wprintf("NO\n");
+		wc_printf("NO\n");
 	}
 	else {
 		memset(buf, 0, 5);
 		serv_puts("NOOP");
 		serv_getln(buf, sizeof buf);
 		if (buf[3] == '*') {
-			wprintf("YES");
+			wc_printf("YES");
 		}
 		else {
-			wprintf("NO");
+			wc_printf("NO");
 		}
 	}
 }
@@ -614,7 +614,7 @@ void session_loop(void)
 			hprintf("HTTP/1.1 404 Security check failed\r\n");
 			hprintf("Content-Type: text/plain\r\n\r\n");
 			begin_burst();
-			wprintf("Security check failed.\r\n");
+			wc_printf("Security check failed.\r\n");
 			end_burst();
 			goto SKIP_ALL_THIS_CRAP;
 		}
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 4d01fb558..94e6c8d36 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -643,7 +643,7 @@ void output_headers(    int do_httpheaders,
 			int suppress_check,
 			int cache);
 void output_custom_content_header(const char *ctype);
-void wprintf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
+void wc_printf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
 void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
 void output_static(const char* What);
 
diff --git a/webcit/who.c b/webcit/who.c
index 79ab3f437..692481e38 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -148,58 +148,58 @@ void edit_me(void)
 	} else {
 		output_headers(1, 1, 0, 0, 0, 0);
 
-		wprintf("<div id=\"banner\">\n");
-		wprintf("<table class=\"who_banner\"><tr><td>");
-		wprintf("<span class=\"titlebar\">");
-		wprintf(_("Edit your session display"));
-		wprintf("</span></td></tr></table>\n");
-		wprintf("</div>\n<div id=\"content\">\n");
-
-		wprintf(_("This screen allows you to change the way your "
+		wc_printf("<div id=\"banner\">\n");
+		wc_printf("<table class=\"who_banner\"><tr><td>");
+		wc_printf("<span class=\"titlebar\">");
+		wc_printf(_("Edit your session display"));
+		wc_printf("</span></td></tr></table>\n");
+		wc_printf("</div>\n<div id=\"content\">\n");
+
+		wc_printf(_("This screen allows you to change the way your "
 			"session appears in the 'Who is online' listing. "
 			"To turn off any 'fake' name you've previously "
 			"set, simply click the appropriate 'change' button "
 			"without typing anything in the corresponding box. "));
-		wprintf("<br />\n");
+		wc_printf("<br />\n");
 
-		wprintf("<form method=\"POST\" action=\"edit_me\">\n");
-		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+		wc_printf("<form method=\"POST\" action=\"edit_me\">\n");
+		wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-		wprintf("<table border=0 width=100%%>\n");
+		wc_printf("<table border=0 width=100%%>\n");
 
-		wprintf("<tr><td><b>");
-		wprintf(_("Room name:"));
-		wprintf("</b></td>\n<td>");
-		wprintf("<input type=\"text\" name=\"fake_roomname\" maxlength=\"64\">\n");
-		wprintf("</td>\n<td align=center>");
-		wprintf("<input type=\"submit\" name=\"change_room_name_button\" value=\"%s\">",
+		wc_printf("<tr><td><b>");
+		wc_printf(_("Room name:"));
+		wc_printf("</b></td>\n<td>");
+		wc_printf("<input type=\"text\" name=\"fake_roomname\" maxlength=\"64\">\n");
+		wc_printf("</td>\n<td align=center>");
+		wc_printf("<input type=\"submit\" name=\"change_room_name_button\" value=\"%s\">",
 			_("Change room name"));
-		wprintf("</td>\n</tr>\n");
-
-		wprintf("<tr><td><b>");
-		wprintf(_("Host name:"));
-		wprintf("</b></td><td>");
-		wprintf("<input type=\"text\" name=\"fake_hostname\" maxlength=\"64\">\n");
-		wprintf("</td>\n<td align=center>");
-		wprintf("<input type=\"submit\" name=\"change_host_name_button\" value=\"%s\">",
+		wc_printf("</td>\n</tr>\n");
+
+		wc_printf("<tr><td><b>");
+		wc_printf(_("Host name:"));
+		wc_printf("</b></td><td>");
+		wc_printf("<input type=\"text\" name=\"fake_hostname\" maxlength=\"64\">\n");
+		wc_printf("</td>\n<td align=center>");
+		wc_printf("<input type=\"submit\" name=\"change_host_name_button\" value=\"%s\">",
 			_("Change host name"));
-		wprintf("</td>\n</tr>\n");
+		wc_printf("</td>\n</tr>\n");
 
 		if (WC->is_aide) {
-			wprintf("<tr><td><b>");
-			wprintf(_("User name:"));
-			wprintf("</b></td><td>");
-			wprintf("<input type=\"text\" name=\"fake_username\" maxlength=\"64\">\n");
-			wprintf("</td>\n<td align=center>");
-			wprintf("<input type=\"submit\" name \"change_user_name_button\" value=\"%s\">",
+			wc_printf("<tr><td><b>");
+			wc_printf(_("User name:"));
+			wc_printf("</b></td><td>");
+			wc_printf("<input type=\"text\" name=\"fake_username\" maxlength=\"64\">\n");
+			wc_printf("</td>\n<td align=center>");
+			wc_printf("<input type=\"submit\" name \"change_user_name_button\" value=\"%s\">",
 				_("Change user name"));
-			wprintf("</td>\n</tr>\n");
+			wc_printf("</td>\n</tr>\n");
 		}
-		wprintf("<tr><td> </td><td> </td><td align=center>");
-		wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
+		wc_printf("<tr><td> </td><td> </td><td align=center>");
+		wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
 			_("Cancel"));
-		wprintf("</td></tr></table>\n");
-		wprintf("</form></center>\n");
+		wc_printf("</td></tr></table>\n");
+		wc_printf("</form></center>\n");
 		wDumpContent(1);
 	}
 }
diff --git a/webcit/wiki.c b/webcit/wiki.c
index b854b00dd..a8a2d12f3 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -48,14 +48,14 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename)
 	
 		/* If we're still not in the correct room, it doesn't exist. */
 		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
-			wprintf(_("There is no room called '%s'."), ChrPtr(roomname));
+			wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
 			return;
 		}
 
 	}
 
 	if (WC->wc_view != VIEW_WIKI) {
-		wprintf(_("'%s' is not a Wiki room."), ChrPtr(roomname));
+		wc_printf(_("'%s' is not a Wiki room."), ChrPtr(roomname));
 		return;
 	}
 
@@ -70,18 +70,18 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename)
 		return;
 	}
 
-	wprintf("<br /><br />"
+	wc_printf("<br /><br />"
 		"<div align=\"center\">"
 		"<table border=\"0\" bgcolor=\"#ffffff\" cellpadding=\"10\">"
 		"<tr><td align=\"center\">"
 	);
-	wprintf("<br><b>");
-	wprintf(_("There is no page called '%s' here."), pagename);
-	wprintf("</b><br><br>");
-	wprintf(_("Select the 'Edit this page' link in the room banner "
+	wc_printf("<br><b>");
+	wc_printf(_("There is no page called '%s' here."), pagename);
+	wc_printf("</b><br><br>");
+	wc_printf(_("Select the 'Edit this page' link in the room banner "
 		"if you would like to create this page."));
-	wprintf("<br><br>");
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("<br><br>");
+	wc_printf("</td></tr></table></div>\n");
 }
 
 
-- 
2.30.2