wrbuf_cstr bit more thread safe YAZ-753
[yaz-moved-to-github.git] / src / wrbuf.c
index c8a3ecf..7015bad 100644 (file)
@@ -1,12 +1,11 @@
-/*
- * Copyright (c) 1995-2003, Index Data.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: wrbuf.c,v 1.2 2003-12-11 00:37:22 adam Exp $
  */
 
-/*
- * Growing buffer for writing various stuff.
+/**
+ * \file wrbuf.c
+ * \brief Implements WRBUF (growing buffer)
  */
 
 #if HAVE_CONFIG_H
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <assert.h>
 
 #include <yaz/wrbuf.h>
+#include <yaz/snprintf.h>
 #include <yaz/yaz-iconv.h>
 
 WRBUF wrbuf_alloc(void)
@@ -26,18 +27,20 @@ WRBUF wrbuf_alloc(void)
     WRBUF n;
 
     if (!(n = (WRBUF)xmalloc(sizeof(*n))))
-       abort();
+        abort();
     n->buf = 0;
     n->size = 0;
     n->pos = 0;
     return n;
 }
 
-void wrbuf_free(WRBUF b, int free_buf)
+void wrbuf_destroy(WRBUF b)
 {
-    if (free_buf && b->buf)
-       xfree(b->buf);
-    xfree(b);
+    if (b)
+    {
+        xfree(b->buf);
+        xfree(b);
+    }
 }
 
 void wrbuf_rewind(WRBUF b)
@@ -45,70 +48,114 @@ 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;
+        togrow = 1024;
     else
-       togrow = b->size;
+        togrow = b->size;
     if (togrow < minsize)
-       togrow = minsize;
+        togrow = minsize;
     if (b->size && !(b->buf =(char *)xrealloc(b->buf, b->size += togrow)))
-       abort();
+        abort();
     else if (!b->size && !(b->buf = (char *)xmalloc(b->size = togrow)))
-       abort();
+        abort();
     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);
+        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)
 {
-    wrbuf_write(b, buf, strlen(buf)+1);  /* '\0'-terminate as well */
-    (b->pos)--;                          /* don't include '\0' in count */
-    return 0;
+    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));
 }
 
-int wrbuf_xmlputs(WRBUF b, const char *cp)
+void wrbuf_vp_puts(const char *buf, void *client_data)
 {
-    while (*cp)
+    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)
     {
-       switch(*cp)
-       {
-       case '<':
-           wrbuf_puts(b, "&lt;");
-           break;
-       case '>':
-           wrbuf_puts(b, "&gt;");
-           break;
-       case '&':
-           wrbuf_puts(b, "&amp;");
-           break;
-       case '"':
-           wrbuf_puts(b, "&quot;");
-           break;
-       case '\'':
-           wrbuf_puts(b, "&apos;");
-           break;
-       default:
-           wrbuf_putc(b, *cp);
-       }
-       cp++;
+        if (*buf == from)
+            wrbuf_putc(b, to);
+        else
+            wrbuf_putc(b, *buf);
+        buf++;
+    }
+}
+
+void wrbuf_chop_right(WRBUF b)
+{
+    while (b->pos && b->buf[b->pos-1] == ' ')
+    {
+        (b->pos)--;
+    }
+}
+
+void wrbuf_xmlputs(WRBUF b, const char *cp)
+{
+    wrbuf_xmlputs_n(b, cp, strlen(cp));
+}
+
+void wrbuf_xmlputs_n(WRBUF b, const char *cp, size_t size)
+{
+    for (; size; size--)
+    {
+        /* 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 '<':
+            wrbuf_puts(b, "&lt;");
+            break;
+        case '>':
+            wrbuf_puts(b, "&gt;");
+            break;
+        case '&':
+            wrbuf_puts(b, "&amp;");
+            break;
+        case '"':
+            wrbuf_puts(b, "&quot;");
+            break;
+        case '\'':
+            wrbuf_puts(b, "&apos;");
+            break;
+        default:
+            wrbuf_putc(b, *cp);
+        }
+        cp++;
     }
-    wrbuf_putc(b, 0);
-    (b->pos)--;
-    return 0;
 }
 
 void wrbuf_printf(WRBUF b, const char *fmt, ...)
@@ -117,44 +164,179 @@ void wrbuf_printf(WRBUF b, const char *fmt, ...)
     char buf[4096];
 
     va_start(ap, fmt);
-#ifdef WIN32
-    _vsnprintf(buf, sizeof(buf)-1, fmt, ap);
-#else
-/* !WIN32 */
-#if HAVE_VSNPRINTF
-    vsnprintf(buf, sizeof(buf)-1, fmt, ap);
-#else
-    vsprintf(buf, fmt, ap);
-#endif
-#endif
+    yaz_vsnprintf(buf, sizeof(buf)-1, fmt, ap);
     wrbuf_puts (b, buf);
 
     va_end(ap);
 }
 
-int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+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];
-       size_t inbytesleft = size;
-       const char *inp = buf;
-       while (inbytesleft)
-       {
-           size_t outbytesleft = sizeof(outbuf);
-           char *outp = outbuf;
-           size_t r = yaz_iconv(cd, (char**) &inp,  &inbytesleft,
-                                &outp, &outbytesleft);
-           if (r == (size_t) (-1))
-           {
-               int e = yaz_iconv_error(cd);
-               if (e != YAZ_ICONV_E2BIG)
-                   break;
-           }
-           wrbuf_write(b, outbuf, outp - outbuf);
-       }
+        char outbuf[128];
+        size_t inbytesleft = size;
+        const char *inp = buf;
+        while (inbytesleft)
+        {
+            size_t outbytesleft = sizeof(outbuf);
+            char *outp = outbuf;
+            size_t r = yaz_iconv(cd, (char**) &inp,  &inbytesleft,
+                                 &outp, &outbytesleft);
+            if (r == (size_t) (-1))
+            {
+                int e = yaz_iconv_error(cd);
+                if (e != YAZ_ICONV_E2BIG)
+                {
+                    ret = -1;
+                    break;
+                }
+            }
+            (*wfunc)(b, outbuf, outp - outbuf);
+        }
     }
     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);
 }
+
+void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
+{
+    wrbuf_iconv_write2(b, cd, buf, size, wrbuf_write);
+}
+
+void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
+{
+    wrbuf_iconv_write(b, cd, strz, strlen(strz));
+}
+
+void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch)
+{
+    char buf[1];
+    buf[0] = ch;
+    wrbuf_iconv_write(b, cd, buf, 1);
+}
+
+void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
+{
+    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[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)
+{
+    if (b->pos >= b->size)
+        wrbuf_grow(b, 1);
+    b->buf[b->pos] = '\0';
+    return b->buf;
+}
+
+void wrbuf_cut_right(WRBUF b, size_t no_to_remove)
+{
+    if (no_to_remove > b->pos)
+        no_to_remove = b->pos;
+    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
+ */
+