AIR/mxml
1
0
Fork 0
mirror of https://github.com/michaelrsweet/mxml.git synced 2024-11-24 11:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not write siblings of the passed node (Issue #228)

Browse Source
This commit is contained in:
Michael R Sweet 2018-10-01 13:15:22 -04:00
parent d32a541211
commit f86c2671aa
No known key found for this signature in database
GPG Key ID: 999559A027815955
3 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -9,6 +9,8 @@
trailer "]]" to the string (Issue #216)
- Cross-compiling failed on install (Issue #218)
- Fixed a crash bug in the `mxmlWrite` functions (Issue #228)
- The `mxmlWrite` functions no longer write the siblings of the passed node
(Issue #228)
- Updated the markdown and ZIP container libraries used for mxmldoc.

2
doc/mxml.man
View File

@ -1,4 +1,4 @@
.TH mxml 3 "Mini-XML API" "09/29/18" "Mini-XML API"
.TH mxml 3 "Mini-XML API" "10/01/18" "Mini-XML API"
.SH NAME
mxml \- Mini-XML API
.SH INCLUDE FILE

58
mxml-file.c
View File

@ -2972,34 +2972,52 @@ mxml_write_node(mxml_node_t *node, /* I - Node to write */
if ((next = current->child) == NULL)
{
while ((next = current->next) == NULL)
if (current == node)
{
if (current == node || !current->parent)
break;
/*
* The ? and ! elements are special-cases and have no end tags...
*/
* Don't traverse to sibling node if we are at the "root" node...
*/
current = current->parent;
next = NULL;
}
else
{
/*
* Try the next sibling, and continue traversing upwards as needed...
*/
if (current->value.element.name[0] != '!' &&
current->value.element.name[0] != '?')
while ((next = current->next) == NULL)
{
col = mxml_write_ws(current, p, cb, MXML_WS_BEFORE_CLOSE, col, putc_cb);
if (current == node || !current->parent)
break;
if ((*putc_cb)('<', p) < 0)
return (-1);
if ((*putc_cb)('/', p) < 0)
return (-1);
if (mxml_write_string(current->value.element.name, p, putc_cb) < 0)
return (-1);
if ((*putc_cb)('>', p) < 0)
return (-1);
/*
* The ? and ! elements are special-cases and have no end tags...
*/
col += strlen(current->value.element.name) + 3;
current = current->parent;
col = mxml_write_ws(current, p, cb, MXML_WS_AFTER_CLOSE, col, putc_cb);
if (current->value.element.name[0] != '!' &&
current->value.element.name[0] != '?')
{
col = mxml_write_ws(current, p, cb, MXML_WS_BEFORE_CLOSE, col, putc_cb);
if ((*putc_cb)('<', p) < 0)
return (-1);
if ((*putc_cb)('/', p) < 0)
return (-1);
if (mxml_write_string(current->value.element.name, p, putc_cb) < 0)
return (-1);
if ((*putc_cb)('>', p) < 0)
return (-1);
col += strlen(current->value.element.name) + 3;
col = mxml_write_ws(current, p, cb, MXML_WS_AFTER_CLOSE, col, putc_cb);
}
if (current == node)
break;
}
}
}