X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fwrbuf.c;h=94704772b95628b55cb456cea244d284e92478ab;hp=d4fc08a3cf7fcdd1498407402d83f9027a0491a9;hb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9

diff --git a/src/wrbuf.c b/src/wrbuf.c
index d4fc08a..9470477 100644
--- a/src/wrbuf.c
+++ b/src/wrbuf.c
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 1995-2003, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: wrbuf.c,v 1.1 2003-10-27 12:21:36 adam Exp $
+ * $Id: wrbuf.c,v 1.8 2005-06-25 15:46:06 adam Exp $
  */
 
-/*
- * Growing buffer for writing various stuff.
+/**
+ * \file wrbuf.c
+ * \brief Implements WRBUF (growing buffer)
  */
 
 #if HAVE_CONFIG_H
@@ -19,13 +20,14 @@
 #include <stdarg.h>
 
 #include <yaz/wrbuf.h>
+#include <yaz/yaz-iconv.h>
 
 WRBUF wrbuf_alloc(void)
 {
     WRBUF n;
 
     if (!(n = (WRBUF)xmalloc(sizeof(*n))))
-	abort();
+        abort();
     n->buf = 0;
     n->size = 0;
     n->pos = 0;
@@ -35,7 +37,7 @@ WRBUF wrbuf_alloc(void)
 void wrbuf_free(WRBUF b, int free_buf)
 {
     if (free_buf && b->buf)
-	xfree(b->buf);
+        xfree(b->buf);
     xfree(b);
 }
 
@@ -49,15 +51,15 @@ int wrbuf_grow(WRBUF b, int minsize)
     int 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;
 }
 
@@ -66,7 +68,7 @@ int wrbuf_write(WRBUF b, const char *buf, int size)
     if (size <= 0)
         return 0;
     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;
@@ -81,29 +83,41 @@ int wrbuf_puts(WRBUF b, const char *buf)
 
 int wrbuf_xmlputs(WRBUF b, const char *cp)
 {
-    while (*cp)
+    return wrbuf_xmlputs_n(b, cp, strlen(cp));
+}
+
+int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size)
+{
+    while (--size >= 0)
     {
-	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++;
+        /* 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)--;
@@ -131,3 +145,57 @@ 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)
+{
+    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;
+            }
+            if (cdata)
+                wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
+            else
+                wrbuf_write(b, outbuf, outp - outbuf);
+        }
+    }
+    else
+    {
+        if (cdata)
+            wrbuf_xmlputs_n(b, buf, size);
+        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)
+{
+    return wrbuf_iconv_write_x(b, cd, buf, size, 0);
+}
+
+int wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+{
+    return wrbuf_iconv_write_x(b, cd, buf, size, 1);
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+