- xml: use <foo/> markup for empty tags.

CVS patchset: 7324
CVS date: 2004/06/14 17:00:13

diff --git a/CHANGES b/CHANGES
index 109bd1502ce0874a9dd6efd9efe16f70fa8e1661..043e5664bfa5639c9dfc040932bf106abf819fbb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@
        - add 'requires' and 'conflicts' tag aliases.
        - python: return ds, not tuple, for ds iteration.
        - python: permit integer keys to ts.dbMatch().
+       - xml: use <foo/> markup for empty tags.
 
 4.3 -> 4.3.1:
        - fix: don't add leading space to %* argv expansion (#119059).

diff --git a/lib/formats.c b/lib/formats.c
index 5084d89f9e58fa6972a88287f5a92c2968ae6477..dd87842d58950fcbedbc44b65bda7f23b625a25f 100644 (file)
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -350,12 +350,19 @@ static /*@only@*/ char * xmlFormat(int_32 type, const void * data,
     }
 /*@=branchstate@*/
 
-    nb = 2 * strlen(xtag) + sizeof("\t<></>") + xmlstrlen(s);
-    te = t = alloca(nb);
-    te = stpcpy( stpcpy( stpcpy(te, "\t<"), xtag), ">");
-    te = xmlstrcpy(te, s);
-    te += strlen(te);
-    te = stpcpy( stpcpy( stpcpy(te, "</"), xtag), ">");
+    nb = xmlstrlen(s);
+    if (nb == 0) {
+       nb += strlen(xtag) + sizeof("\t</>");
+       te = t = alloca(nb);
+       te = stpcpy( stpcpy( stpcpy(te, "\t<"), xtag), "/>");
+    } else {
+       nb += 2 * strlen(xtag) + sizeof("\t<></>");
+       te = t = alloca(nb);
+       te = stpcpy( stpcpy( stpcpy(te, "\t<"), xtag), ">");
+       te = xmlstrcpy(te, s);
+       te += strlen(te);
+       te = stpcpy( stpcpy( stpcpy(te, "</"), xtag), ">");
+    }
 
     /* XXX s was malloc'd */
 /*@-branchstate@*/