/*
- * Copyright (c) 1995-2003, Index Data.
+ * Copyright (c) 1995-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: wrbuf.c,v 1.2 2003-12-11 00:37:22 adam Exp $
+ * $Id: wrbuf.c,v 1.5 2004-10-01 11:44:46 adam Exp $
*/
/*
int wrbuf_xmlputs(WRBUF b, const char *cp)
{
- while (*cp)
+ return wrbuf_xmlputs_n(b, cp, strlen(cp));
+}
+
+int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size)
+{
+ while (--size >= 0)
{
+ /* only TAB,CR,LF of ASCII CTRL are allowed in XML 1.0! */
+ if (*cp >= 0 && *cp <= 31)
+ if (*cp != 9 && *cp != 10 && *cp != 13)
+ {
+ cp++; /* we silently ignore (delete) these.. */
+ continue;
+ }
switch(*cp)
{
case '<':
va_end(ap);
}
-int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+ int size, int cdata)
{
if (cd)
{
if (e != YAZ_ICONV_E2BIG)
break;
}
- wrbuf_write(b, outbuf, outp - outbuf);
+ if (cdata)
+ wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
+ else
+ wrbuf_write(b, outbuf, outp - outbuf);
}
}
else
- wrbuf_write(b, buf, size);
+ {
+ if (cdata)
+ wrbuf_xmlputs_n(b, buf, size);
+ else
+ wrbuf_write(b, buf, size);
+ }
return wrbuf_len(b);
}
+
+int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+{
+ return wrbuf_iconv_write_x(b, cd, buf, size, 0);
+}
+
+int wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+{
+ return wrbuf_iconv_write_x(b, cd, buf, size, 1);
+}
+