Changed include/yaz/diagbib1.h and added include/yaz/diagsrw.h with

[yaz-moved-to-github.git] / src / wrbuf.c

diff --git a/src/wrbuf.c b/src/wrbuf.c
index bb87507..bca1636 100644 (file)
--- a/src/wrbuf.c
+++ b/src/wrbuf.c
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: wrbuf.c,v 1.3 2004-03-15 21:39:06 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,13 +83,20 @@ int wrbuf_puts(WRBUF b, const char *buf)
 
 int wrbuf_xmlputs(WRBUF b, const char *cp)
 {
-    return wrbuf_write_cdata(b, cp, strlen(cp));
+    return wrbuf_xmlputs_n(b, cp, strlen(cp));
 }
 
-int wrbuf_write_cdata(WRBUF b, const char *cp, int size)
+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 '<':
@@ -158,7 +166,7 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
                    break;
            }
            if (cdata)
-               wrbuf_write_cdata(b, outbuf, outp - outbuf);
+               wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
            else
                wrbuf_write(b, outbuf, outp - outbuf);
        }
@@ -166,7 +174,7 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
     else
     {
        if (cdata)
-           wrbuf_write_cdata(b, buf, size);
+           wrbuf_xmlputs_n(b, buf, size);
        else
            wrbuf_write(b, buf, size);
     }