[libvirt] [PATCH] fix Relax-NG pattern matching

John Levon levon at movementarian.org
Thu Jul 24 16:40:33 UTC 2008


Don't use unescaped meta-characters.

Signed-off-by: John Levon <john.levon at sun.com>


Index: docs/libvirt.rng
===================================================================
RCS file: /data/cvs/libvirt/docs/libvirt.rng,v
retrieving revision 1.9
diff -u -r1.9 libvirt.rng
--- docs/libvirt.rng	10 Jul 2008 08:05:39 -0000	1.9
+++ docs/libvirt.rng	24 Jul 2008 16:40:16 -0000
@@ -840,7 +840,7 @@
   </define>
   <define name='domainName'>
     <data type='string'>
-      <param name="pattern">[A-Za-z0-9_.:/\+\-&-]+</param>
+      <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param>
     </data>
   </define>
   <define name='genericName'>
@@ -860,22 +860,22 @@
   </define>
   <define name='filePath'>
     <data type='string'>
-      <param name="pattern">[a-zA-Z0-9_\+\-%./&]+</param>
+      <param name="pattern">[a-zA-Z0-9_\.\+\-&/%]+</param>
     </data>
   </define>
   <define name='absFilePath'>
     <data type='string'>
-      <param name="pattern">/[a-zA-Z0-9_\+\-%./&]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\.\+\-&/%]+</param>
     </data>
   </define>
   <define name='devicePath'>
     <data type='string'>
-      <param name="pattern">/[a-zA-Z0-9_\+\-%/]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param>
     </data>
   </define>
   <define name='deviceName'>
     <data type='string'>
-      <param name="pattern">[a-zA-Z0-9_\-:./]+</param>
+      <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param>
     </data>
   </define>
   <define name='addrMAC'>




More information about the libvir-list mailing list