-void xmpp_roster_item(struct CitContext *cptr)
-{
-
- XPUT("<item subscription=\"both\" jid=\"");
- XPutProp(cptr->cs_inet_email, strlen(cptr->cs_inet_email));
- XPUT("\" name=\"");
- XPutProp(cptr->user.fullname, strlen(cptr->user.fullname));
- XPUT("\">"
- "<group>");
- XPutBody(CFG_KEY(c_humannode));
- XPUT("</group>"
- "</item>");
+void xmpp_roster_item(struct CitContext *cptr) {
+ char xmlbuf1[256];
+ char xmlbuf2[256];
+
+ cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
+ xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
+ );
+ cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+ cprintf("</item>");