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

diff --git a/src/wrbuf.c b/src/wrbuf.c
index d4fc08a..9caf93c 100644
--- a/src/wrbuf.c
+++ b/src/wrbuf.c
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 1995-2003, Index Data.
+ * Copyright (c) 1995-2004, Index Data.
  * 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.6 2004-10-15 00:19:01 adam Exp $
  */
 
-/*
- * Growing buffer for writing various stuff.
+/**
+ * \file wrbuf.c
+ * \brief Implements WRBUF (growing buffer)
  */
 
 #if HAVE_CONFIG_H
@@ -19,6 +20,7 @@
 #include <stdarg.h>
 
 #include <yaz/wrbuf.h>
+#include <yaz/yaz-iconv.h>
 
 WRBUF wrbuf_alloc(void)
 {
@@ -81,8 +83,20 @@ 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)
     {
+	/* 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 '<':
@@ -131,3 +145,49 @@ 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);
+}
+