X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fwrbuf.c;h=7015bade5050c23e39e065ad45f3a02450f86b12;hp=f90764ace03ad0f7dc8eeba707efa458f917f9b7;hb=97fafedd350b74076d8a8e31e23102fa22d4b430;hpb=d38ee71c31b49ad13164039140ed47d18e9432cb diff --git a/src/wrbuf.c b/src/wrbuf.c index f90764a..7015bad 100644 --- a/src/wrbuf.c +++ b/src/wrbuf.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) Index Data * See the file LICENSE for details. - * - * $Id: wrbuf.c,v 1.19 2007-03-20 21:37:32 adam Exp $ */ /** @@ -18,6 +16,7 @@ #include #include #include +#include #include #include @@ -37,8 +36,11 @@ WRBUF wrbuf_alloc(void) void wrbuf_destroy(WRBUF b) { - xfree(b->buf); - xfree(b); + if (b) + { + xfree(b->buf); + xfree(b); + } } void wrbuf_rewind(WRBUF b) @@ -46,9 +48,9 @@ void wrbuf_rewind(WRBUF b) b->pos = 0; } -int wrbuf_grow(WRBUF b, int minsize) +int wrbuf_grow(WRBUF b, size_t minsize) { - int togrow; + size_t togrow; if (!b->size) togrow = 1024; @@ -63,24 +65,39 @@ int wrbuf_grow(WRBUF b, int minsize) return 0; } -int wrbuf_write(WRBUF b, const char *buf, int size) +void wrbuf_write(WRBUF b, const char *buf, size_t size) { if (size <= 0) - return 0; + return; if (b->pos + size >= b->size) wrbuf_grow(b, size); memcpy(b->buf + b->pos, buf, size); b->pos += size; - return 0; } -int wrbuf_puts(WRBUF b, const char *buf) +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)); - return 0; } -int wrbuf_puts_replace_char(WRBUF b, const char *buf, +void wrbuf_vp_puts(const char *buf, void *client_data) +{ + WRBUF b = (WRBUF) client_data; + wrbuf_puts(b, buf); +} + +void wrbuf_puts_replace_char(WRBUF b, const char *buf, const char from, const char to) { while(*buf) @@ -91,7 +108,6 @@ int wrbuf_puts_replace_char(WRBUF b, const char *buf, wrbuf_putc(b, *buf); buf++; } - return 0; } void wrbuf_chop_right(WRBUF b) @@ -102,14 +118,14 @@ void wrbuf_chop_right(WRBUF b) } } -int wrbuf_xmlputs(WRBUF b, const char *cp) +void wrbuf_xmlputs(WRBUF b, const char *cp) { - return wrbuf_xmlputs_n(b, cp, strlen(cp)); + wrbuf_xmlputs_n(b, cp, strlen(cp)); } -int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size) +void wrbuf_xmlputs_n(WRBUF b, const char *cp, size_t size) { - while (--size >= 0) + for (; size; size--) { /* only TAB,CR,LF of ASCII CTRL are allowed in XML 1.0! */ if (*cp >= 0 && *cp <= 31) @@ -140,7 +156,6 @@ int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size) } cp++; } - return 0; } void wrbuf_printf(WRBUF b, const char *fmt, ...) @@ -155,12 +170,14 @@ void wrbuf_printf(WRBUF b, const char *fmt, ...) va_end(ap); } -static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf, - int 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) { - char outbuf[12]; + char outbuf[128]; size_t inbytesleft = size; const char *inp = buf; while (inbytesleft) @@ -173,51 +190,69 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf, { int e = yaz_iconv_error(cd); if (e != YAZ_ICONV_E2BIG) + { + ret = -1; 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); - } - return wrbuf_len(b); + (*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); } -int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size) +void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size) { - return wrbuf_iconv_write_x(b, cd, buf, size, 0); + wrbuf_iconv_write2(b, cd, buf, size, wrbuf_write); } -int wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz) +void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz) { - return wrbuf_iconv_write(b, cd, strz, strlen(strz)); + wrbuf_iconv_write(b, cd, strz, strlen(strz)); } -int wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch) +void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch) { char buf[1]; buf[0] = ch; - return wrbuf_iconv_write(b, cd, buf, 1); + wrbuf_iconv_write(b, cd, buf, 1); } -int wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, int size) +void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size) { - return 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_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) { if (cd) { - char outbuf[12]; + char outbuf[16]; size_t outbytesleft = sizeof(outbuf); char *outp = outbuf; size_t r = yaz_iconv(cd, 0, 0, &outp, &outbytesleft); @@ -228,8 +263,9 @@ void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd) const char *wrbuf_cstr(WRBUF b) { - wrbuf_putc(b, '\0'); /* add '\0' */ - (b->pos)--; /* don't include '\0' in count */ + if (b->pos >= b->size) + wrbuf_grow(b, 1); + b->buf[b->pos] = '\0'; return b->buf; } @@ -240,9 +276,65 @@ void wrbuf_cut_right(WRBUF b, size_t no_to_remove) b->pos = b->pos - no_to_remove; } +void wrbuf_puts_escaped(WRBUF b, const char *str) +{ + wrbuf_write_escaped(b, str, strlen(str)); +} + +void wrbuf_write_escaped(WRBUF b, const char *str, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + if (str[i] < ' ' || str[i] > 126) + wrbuf_printf(b, "\\x%02X", str[i] & 0xff); + else + 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 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab