Changeset 5206 for pjproject/trunk

Timestamp:

Dec 3, 2015 11:43:58 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Added feature of CDATA content handling into XML parser.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/xml.c (modified) (2 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/xml.c

@@ -131 +131 @@
 
     /* Sub nodes. */
-    while (*scanner->curptr == '<' && *(scanner->curptr+1) != '/') {
+    while (*scanner->curptr == '<' && *(scanner->curptr+1) != '/'
+                                   && *(scanner->curptr+1) != '!')
+    {
         pj_xml_node *sub_node = xml_parse_node(pool, scanner);
         pj_list_push_back( &node->node_head, sub_node );
@@ -139 +141 @@
     if (!pj_scan_is_eof(scanner) && *scanner->curptr != '<') {
         pj_scan_get_until_ch(scanner, '<', &node->content);
+    }
+
+    /* CDATA content. */
+    if (*scanner->curptr == '<' && *(scanner->curptr+1) == '!' &&
+        pj_scan_strcmp(scanner, "<![CDATA[", 9) == 0)
+    {
+        pj_scan_advance_n(scanner, 9, PJ_FALSE);
+        pj_scan_get_until_ch(scanner, ']', &node->content);
+        while (pj_scan_strcmp(scanner, "]]>", 3)) {
+            pj_str_t dummy;
+            pj_scan_get_until_ch(scanner, ']', &dummy);
+        }
+        node->content.slen = scanner->curptr - node->content.ptr;
+        pj_scan_advance_n(scanner, 3, PJ_TRUE);
     }