/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
void wrbuf_destroy(WRBUF b)
{
- xfree(b->buf);
- xfree(b);
+ if (b)
+ {
+ xfree(b->buf);
+ xfree(b);
+ }
}
void wrbuf_rewind(WRBUF b)
b->pos += size;
}
+void wrbuf_insert(WRBUF b, size_t pos, const char *buf, size_t size)
+{
+ if (size <= 0 || pos > b->pos)
+ return;
+ if (b->pos + size >= b->size)
+ wrbuf_grow(b, size);
+ memmove(b->buf + pos + size, b->buf + pos, b->pos - pos);
+ memcpy(b->buf + pos, buf, size);
+ b->pos += size;
+}
+
void wrbuf_puts(WRBUF b, const char *buf)
{
wrbuf_write(b, buf, strlen(buf));
}
-void wrbuf_vputs(const char *buf, void *client_data)
+void wrbuf_vp_puts(const char *buf, void *client_data)
{
- wrbuf_write((WRBUF) client_data, buf, strlen(buf));
+ WRBUF b = (WRBUF) client_data;
+ wrbuf_puts(b, buf);
}
-void wrbuf_puts_replace_char(WRBUF b, const char *buf,
+void wrbuf_puts_replace_char(WRBUF b, const char *buf,
const char from, const char to)
{
while(*buf)
va_end(ap);
}
-static void wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
- size_t size, int cdata)
+int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+ size_t size, int cdata)
{
+ int ret = 0;
if (cd)
{
char outbuf[128];
{
int e = yaz_iconv_error(cd);
if (e != YAZ_ICONV_E2BIG)
+ {
+ ret = -1;
break;
+ }
}
- if (cdata)
- wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
- else
+ switch (cdata)
+ {
+ case 0:
wrbuf_write(b, outbuf, outp - outbuf);
+ break;
+ case 1:
+ wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
+ break;
+ case 2:
+ wrbuf_json_write(b, outbuf, outp - outbuf);
+ break;
+ }
}
}
else
{
- if (cdata)
- wrbuf_xmlputs_n(b, buf, size);
- else
+ switch (cdata)
+ {
+ case 0:
wrbuf_write(b, buf, size);
+ break;
+ case 1:
+ wrbuf_xmlputs_n(b, buf, size);
+ break;
+ case 2:
+ wrbuf_json_write(b, buf, size);
+ }
}
+ return ret;
}
void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1);
}
+void wrbuf_iconv_json_write(WRBUF b, yaz_iconv_t cd,
+ const char *buf, size_t size)
+{
+ wrbuf_iconv_write_x(b, cd, buf, size, 2);
+}
+
+void wrbuf_iconv_json_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
+{
+ wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 2);
+}
+
void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd)
{
if (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