Changeset 212 for trunk/src/helpers/xml.c

Timestamp:

Aug 22, 2002, 9:45:41 PM (23 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/xml.c (modified) (7 diffs)

trunk/src/helpers/xml.c

@@ -3101 +3101 @@
 
 /*
+ *@@ ESCAPES:
+ *
+ *@@added V0.9.21 (2002-08-21) [umoeller]
+ */
+
+typedef struct _ESCAPES
+{
+    XSTRING strQuot1,       // "
+            strQuot2,       // "
+            strAmp1,        // &
+            strAmp2,        // &
+            strLT1,         // <
+            strLT2,         // &lt;
+            strGT1,         // >
+            strGT2;         // &gt;
+
+    XSTRING strTemp;        // temp buffer
+
+} ESCAPES, *PESCAPES;
+
+/*
+ *@@ DoEscapes:
+ *
+ *@@added V0.9.21 (2002-08-21) [umoeller]
+ */
+
+VOID DoEscapes(PESCAPES pEscapes,
+               BOOL fQuotesToo)
+{
+    ULONG   ulOfs;
+    size_t  ShiftTable[256];
+    BOOL    fRepeat;
+
+    if (fQuotesToo)
+    {
+        ulOfs = 0;
+        fRepeat = FALSE;
+        while (xstrFindReplace(&pEscapes->strTemp,
+                               &ulOfs,
+                               &pEscapes->strQuot1,
+                               &pEscapes->strQuot2,
+                               ShiftTable,
+                               &fRepeat))
+            ;
+    }
+
+    ulOfs = 0;
+    fRepeat = FALSE;
+    while (xstrFindReplace(&pEscapes->strTemp,
+                           &ulOfs,
+                           &pEscapes->strLT1,
+                           &pEscapes->strLT2,
+                           ShiftTable,
+                           &fRepeat))
+        ;
+
+    ulOfs = 0;
+    fRepeat = FALSE;
+    while (xstrFindReplace(&pEscapes->strTemp,
+                           &ulOfs,
+                           &pEscapes->strGT1,
+                           &pEscapes->strGT2,
+                           ShiftTable,
+                           &fRepeat))
+        ;
+
+    // replace ampersands last
+    ulOfs = 0;
+    fRepeat = FALSE;
+    while (xstrFindReplace(&pEscapes->strTemp,
+                           &ulOfs,
+                           &pEscapes->strAmp1,
+                           &pEscapes->strAmp2,
+                           ShiftTable,
+                           &fRepeat))
+        ;
+}
+
+/*
  *@@ WriteNodes:
  *      internal helper for writing out the nodes.
@@ -3106 +3185 @@
  *
  *@@added V0.9.12 (2001-05-21) [umoeller]
+ *@@changed V0.9.21 (2002-08-21) [umoeller]: changed prototype, fixed unescaped characters in attributes and content
  */
 
 static VOID WriteNodes(PXSTRING pxstr,
+                       PESCAPES pEscapes,
                        PDOMNODE pDomNode)       // in: node whose children are to be written (initially DOCUMENT)
 {
@@ -3143 +3224 @@
                     xstrcats(pxstr, &pAttribNode->NodeBase.strNodeName);
                     xstrcat(pxstr, "=\"", 0);
-                    xstrcats(pxstr, pAttribNode->pstrNodeValue);
+
+                    // copy attribute value to temp buffer first
+                    // so we can escape quotes and ampersands
+                    // V0.9.21 (2002-08-21) [umoeller]
+                    xstrcpys(&pEscapes->strTemp, pAttribNode->pstrNodeValue);
+
+                    DoEscapes(pEscapes,
+                              TRUE);        // quotes too
+
+                    // alright, use that
+                    xstrcats(pxstr, &pEscapes->strTemp);
                     xstrcatc(pxstr, '\"');
                 }
@@ -3154 +3245 @@
 
                     // recurse into this child element
-                    WriteNodes(pxstr, pChildNode);
+                    WriteNodes(pxstr, pEscapes, pChildNode);
 
                     if (!fMixedContent)
@@ -3176 +3267 @@
             case DOMNODE_COMMENT:
                 // that's simple
-                xstrcats(pxstr, pChildNode->pstrNodeValue);
+                xstrcpys(&pEscapes->strTemp,
+                         pChildNode->pstrNodeValue);
+
+                DoEscapes(pEscapes,         // V0.9.21 (2002-08-21) [umoeller]
+                          FALSE);           // quotes not
+
+                xstrcats(pxstr, &pEscapes->strTemp);
             break;
 
@@ -3288 +3385 @@
     else
     {
+        ESCAPES esc;
+
         // <?xml version="1.0" encoding="ISO-8859-1"?>
         xstrcpy(pxstr, "<?xml version=\"1.0\" encoding=\"", 0);
@@ -3301 +3400 @@
         }
 
+        xstrInitCopy(&esc.strQuot1, "\"", 0);
+        xstrInitCopy(&esc.strQuot2, "&quot;", 0);
+        xstrInitCopy(&esc.strAmp1, "&", 0);
+        xstrInitCopy(&esc.strAmp2, "&amp;", 0);
+        xstrInitCopy(&esc.strLT1, "<", 0);
+        xstrInitCopy(&esc.strLT2, "&lt;", 0);
+        xstrInitCopy(&esc.strGT1, ">", 0);
+        xstrInitCopy(&esc.strGT2, "&gt;", 0);
+
+        xstrInit(&esc.strTemp, 0);       // temp buffer
+
         // write out children
-        WriteNodes(pxstr, (PDOMNODE)pDocument);
+        WriteNodes(pxstr, &esc, (PDOMNODE)pDocument);
+
+        xstrClear(&esc.strQuot1);
+        xstrClear(&esc.strQuot2);
+        xstrClear(&esc.strAmp1);
+        xstrClear(&esc.strAmp2);
+        xstrClear(&esc.strLT1);
+        xstrClear(&esc.strLT2);
+        xstrClear(&esc.strGT1);
+        xstrClear(&esc.strGT2);
+
+        xstrClear(&esc.strTemp);       // temp buffer
 
         xstrcatc(pxstr, '\n');