X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fwrbuf.c;h=bca16365a153061bda052cab2c1bdd6161202bd5;hb=725db3d87d84a1072939d74a537454a5d4e1e0cc;hp=c8a3ecf6e0a594bb49da4eeff785bb5df079d0da;hpb=6ad80c673e9591ae178154cfe2ce002834cfdafd;p=yaz-moved-to-github.git

diff --git a/src/wrbuf.c b/src/wrbuf.c
index c8a3ecf..bca1636 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.2 2003-12-11 00:37:22 adam Exp $
+ * $Id: wrbuf.c,v 1.7 2005-01-15 19:47:14 adam Exp $
  */
 
-/*
- * Growing buffer for writing various stuff.
+/**
+ * \file wrbuf.c
+ * \brief Implements WRBUF (growing buffer)
  */
 
 #if HAVE_CONFIG_H
@@ -82,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 '<':
@@ -132,7 +145,8 @@ void wrbuf_printf(WRBUF b, const char *fmt, ...)
     va_end(ap);
 }
 
-int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+			       int size, int cdata)
 {
     if (cd)
     {
@@ -151,10 +165,29 @@ int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
 		if (e != YAZ_ICONV_E2BIG)
 		    break;
 	    }
-	    wrbuf_write(b, outbuf, outp - outbuf);
+	    if (cdata)
+		wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
+	    else
+		wrbuf_write(b, outbuf, outp - outbuf);
 	}
     }
     else
-	wrbuf_write(b, buf, size);
+    {
+	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);
+}
+