X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fwrbuf.c;h=31729b031c11fc362b04a686d0acd6a9c7123518;hp=973f0802a11195ba11f31bb84ea9aed1007a50dd;hb=5e1889250160764822014ce89ee19dc84e5ce310;hpb=3eba413ef7e80467c7831731a8e35c733e447c47 diff --git a/src/wrbuf.c b/src/wrbuf.c index 973f080..31729b0 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) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: wrbuf.c,v 1.17 2007-03-18 12:59:56 adam Exp $ */ /** @@ -35,16 +33,13 @@ WRBUF wrbuf_alloc(void) return n; } -void wrbuf_free(WRBUF b, int free_buf) -{ - if (free_buf && b->buf) - xfree(b->buf); - xfree(b); -} - void wrbuf_destroy(WRBUF b) { - wrbuf_free(b, 1); + if (b) + { + xfree(b->buf); + xfree(b); + } } void wrbuf_rewind(WRBUF b) @@ -52,9 +47,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; @@ -69,37 +64,32 @@ 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_puts(WRBUF b, const char *buf) { - wrbuf_write(b, buf, strlen(buf)+1); /* '\0'-terminate as well */ - (b->pos)--; /* don't include '\0' in count */ - return 0; + wrbuf_write(b, buf, strlen(buf)); } -int 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){ + while(*buf) + { if (*buf == from) wrbuf_putc(b, to); else wrbuf_putc(b, *buf); buf++; } - wrbuf_putc(b, 0); - (b->pos)--; /* don't include '\0' in count */ - return 0; } void wrbuf_chop_right(WRBUF b) @@ -107,18 +97,17 @@ void wrbuf_chop_right(WRBUF b) while (b->pos && b->buf[b->pos-1] == ' ') { (b->pos)--; - b->buf[b->pos] = '\0'; } } -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) @@ -149,9 +138,6 @@ int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size) } cp++; } - wrbuf_putc(b, 0); - (b->pos)--; - return 0; } void wrbuf_printf(WRBUF b, const char *fmt, ...) @@ -166,12 +152,12 @@ 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) +static void wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf, + size_t size, int cdata) { if (cd) { - char outbuf[12]; + char outbuf[128]; size_t inbytesleft = size; const char *inp = buf; while (inbytesleft) @@ -199,35 +185,52 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf, 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) +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_write_x(b, cd, buf, size, 0); } -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_write_x(b, cd, buf, size, 1); +} + +void wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, const char *strz) +{ + wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1); +} + +void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd) +{ + if (cd) + { + char outbuf[16]; + size_t outbytesleft = sizeof(outbuf); + char *outp = outbuf; + size_t r = yaz_iconv(cd, 0, 0, &outp, &outbytesleft); + if (r != (size_t) (-1)) + wrbuf_write(b, outbuf, outp - outbuf); + } } const char *wrbuf_cstr(WRBUF b) { - wrbuf_write(b, "", 1); /* '\0'-terminate as well */ - (b->pos)--; /* don't include '\0' in count */ + wrbuf_putc(b, '\0'); /* add '\0' */ + (b->pos)--; /* don't include '\0' in count */ return b->buf; } @@ -238,9 +241,25 @@ 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]); +} + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab