From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 23 Oct 2012 12:16:44 +0000 (+0200)
Subject: xml: omit domain name from comment if it contains double hyphen
X-Git-Tag: v1.0.0-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b704ab8235af010b1fda4886201aab02098b969;p=thirdparty%2Flibvirt.git

xml: omit domain name from comment if it contains double hyphen

We put a comment containing "virsh edit <domain_name>" at the start of
the XML. W3C recommendation forbids the use of "--" in comments [1] and
libvirt can't parse it either. This patch omits the domain name if it
contains a double hyphen.

[1] http://www.w3.org/TR/REC-xml/#sec-comments
---

diff --git a/src/util/xml.c b/src/util/xml.c
index 39bc1114f2..f3dc256335 100644
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -807,12 +807,16 @@ or other application using the libvirt API.\n\
     if (safewrite(fd, cmd, len) != len)
         return -1;
 
-    if (safewrite(fd, " ", 1) != 1)
-        return -1;
+    /* Omit the domain name if it contains a double hyphen
+     * because they aren't allowed in XML comments */
+    if (!strstr(name, "--")) {
+        if (safewrite(fd, " ", 1) != 1)
+            return -1;
 
-    len = strlen(name);
-    if (safewrite(fd, name, len) != len)
-        return -1;
+        len = strlen(name);
+        if (safewrite(fd, name, len) != len)
+            return -1;
+    }
 
     len = strlen(epilogue);
     if (safewrite(fd, epilogue, len) != len)