r5036: *** empty log message ***

[kmrcl.git] / xml-utils.lisp

diff --git a/xml-utils.lisp b/xml-utils.lisp
index 756d3393021635efedb68a22d9b3af9c76143551..be7952bfedad0f612311db2d5f4553771301447b 100644 (file)
--- a/xml-utils.lisp
+++ b/xml-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: xml-utils.lisp,v 1.5 2002/11/25 07:45:36 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.7 2003/05/26 21:43:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,7 +17,7 @@
 ;;;; *************************************************************************
 
 (in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(declaim (optimize (speed 3) (safety 2) (compilation-speed 0) (debug 3)))
 
 
 (defun wrap-with-xml (str entity)
@@ -52,7 +52,8 @@
             (if bracketpos
                 (let* ((starttag (1+ bracketpos))
                        (endtag (+ starttag taglen)))
-                  (if (string= tag xmlstr :start2 starttag :end2 endtag)
+                  (if (and (< endtag end-xmlstr)
+                           (string= tag xmlstr :start2 starttag :end2 endtag))
                       (let* ((char-after-tag (char xmlstr endtag)))
                         (declare (character char-after-tag))
                         (if (or (char= #\> char-after-tag) (char= #\space char-after-tag))
@@ -90,3 +91,15 @@ and position of character following end tag."
 (defun xml-cdata (str)
   (concatenate 'string "<![CDATA[" str "]]>"))
 
+(defun write-xml-cdata (str s)
+  (declare (simple-string str) (optimize (speed 3) (safety 0)))
+  (do* ((len (length str))
+       (i 0 (1+ i)))
+       ((= i len) str)
+    (declare (fixnum i len))
+    (let ((c (schar str i)))
+      (case c
+       (#\< (write-string "&lt;" s))
+       (#\& (write-string "&amp;" s))
+       (t   (write-char c s))))))
+