/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
va_end(ap);
}
-int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
- size_t size, int cdata)
+int wrbuf_iconv_write2(WRBUF b, yaz_iconv_t cd, const char *buf,
+ size_t size,
+ void (*wfunc)(WRBUF, const char *, size_t))
{
int ret = 0;
if (cd)
break;
}
}
- if (cdata)
- wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
- else
- wrbuf_write(b, outbuf, outp - outbuf);
+ (*wfunc)(b, outbuf, outp - outbuf);
}
}
else
- {
- if (cdata)
- wrbuf_xmlputs_n(b, buf, size);
- else
- wrbuf_write(b, buf, size);
- }
+ (*wfunc)(b, buf, size);
return ret;
}
+int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+ size_t size, int cdata)
+{
+ return wrbuf_iconv_write2(b, cd, buf, size,
+ cdata ? wrbuf_xmlputs_n : wrbuf_write);
+}
+
void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
{
- wrbuf_iconv_write_x(b, cd, buf, size, 0);
+ wrbuf_iconv_write2(b, cd, buf, size, wrbuf_write);
}
void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
{
- wrbuf_iconv_write_x(b, cd, buf, size, 1);
+ wrbuf_iconv_write2(b, cd, buf, size, wrbuf_xmlputs_n);
}
void wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, const char *strz)
{
- wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1);
+ wrbuf_iconv_write2(b, cd, strz, strlen(strz), wrbuf_xmlputs_n);
+}
+
+void wrbuf_iconv_json_write(WRBUF b, yaz_iconv_t cd,
+ const char *buf, size_t size)
+{
+ wrbuf_iconv_write2(b, cd, buf, size, wrbuf_json_write);
+}
+
+void wrbuf_iconv_json_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
+{
+ wrbuf_iconv_write2(b, cd, strz, strlen(strz), wrbuf_json_write);
}
void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd)
wrbuf_putc(b, str[i]);
}
+void wrbuf_json_write(WRBUF b, const char *cp, size_t sz)
+{
+ size_t i;
+ for (i = 0; i < sz; i++)
+ {
+ if (cp[i] > 0 && cp[i] < 32)
+ {
+ wrbuf_putc(b, '\\');
+ switch (cp[i])
+ {
+ case '\b': wrbuf_putc(b, 'b'); break;
+ case '\f': wrbuf_putc(b, 'f'); break;
+ case '\n': wrbuf_putc(b, 'n'); break;
+ case '\r': wrbuf_putc(b, 'r'); break;
+ case '\t': wrbuf_putc(b, 't'); break;
+ default:
+ wrbuf_printf(b, "u%04x", cp[i]);
+ }
+ }
+ else if (cp[i] == '"')
+ {
+ wrbuf_putc(b, '\\'); wrbuf_putc(b, '"');
+ }
+ else if (cp[i] == '\\')
+ {
+ wrbuf_putc(b, '\\'); wrbuf_putc(b, '\\');
+ }
+ else
+ { /* leave encoding as raw UTF-8 */
+ wrbuf_putc(b, cp[i]);
+ }
+ }
+
+}
+
+void wrbuf_json_puts(WRBUF b, const char *str)
+{
+ wrbuf_json_write(b, str, strlen(str));
+}
+
/*
* Local variables:
* c-basic-offset: 4