External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow trailing ',' in lists, and '_' in names

Browse Source
This commit is contained in:
Daniel P. Berrange 2006-09-03 17:46:32 +00:00
parent 184c0bba15
commit c63f08e06f
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Sep 3 12:50:12 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/conf.c: Allow '_' in variable names, and don't fail if there
is a trailing ',' at the end of a list.
* tests/confdata/fc4.conf, tests/confdata/fc4.out: Expand test
config to include a '_' in a name, and a trailing ',' in a list.
Sun Sep 3 12:47:42 EDT 2006 Daniel Berrange <berrange@redhat.com> Sun Sep 3 12:47:42 EDT 2006 Daniel Berrange <berrange@redhat.com>
* tests/.cvsignore, tests/confdata/.cvsignore: Ignore autogenerated * tests/.cvsignore, tests/confdata/.cvsignore: Ignore autogenerated

5
src/conf.c
View File

@ -443,6 +443,9 @@ virConfParseValue(virConfParserCtxtPtr ctxt)
} }
NEXT; NEXT;
SKIP_BLANKS; SKIP_BLANKS;
if (CUR == ']') {
break;
}
tmp = virConfParseValue(ctxt); tmp = virConfParseValue(ctxt);
if (tmp == NULL) { if (tmp == NULL) {
virConfFreeList(lst); virConfFreeList(lst);
@ -508,7 +511,7 @@ virConfParseName(virConfParserCtxtPtr ctxt)
virConfError(NULL, VIR_ERR_CONF_SYNTAX, "expecting a name", ctxt->line); virConfError(NULL, VIR_ERR_CONF_SYNTAX, "expecting a name", ctxt->line);
return(NULL); return(NULL);
} }
while ((ctxt->cur < ctxt->end) && ((IS_CHAR(CUR)) || (IS_DIGIT(CUR)))) while ((ctxt->cur < ctxt->end) && ((IS_CHAR(CUR)) || (IS_DIGIT(CUR)) || (CUR == '_')))
NEXT; NEXT;
ret = strndup(base, ctxt->cur - base); ret = strndup(base, ctxt->cur - base);
if (ret == NULL) { if (ret == NULL) {

3
tests/confdata/fc4.conf
View File

@ -2,9 +2,10 @@ kernel="/boot/vmlinuz-2.6.15-1.2054_FC5xenU"
ramdisk="/boot/initrd-2.6.15-1.2054_FC5xenU.img" ramdisk="/boot/initrd-2.6.15-1.2054_FC5xenU.img"
memory=128 # should be enough memory=128 # should be enough
name="fc4" name="fc4"
vif = [ 'mac=aa:00:00:00:00:11, bridge=xenbr0' ] vif = [ 'mac=aa:00:00:00:00:11, bridge=xenbr0', ]
disk = ['file:/xen/fc4.img,sda1,w'] disk = ['file:/xen/fc4.img,sda1,w']
root = "/dev/sda1" root = "/dev/sda1"
extra = "ro selinux=0 3" extra = "ro selinux=0 3"
on_reboot = 'restart'
# just for testing ... # just for testing ...
tst = [ 1, 2, [ 3, 4 ], 5] tst = [ 1, 2, [ 3, 4 ], 5]

1
tests/confdata/fc4.out
View File

@ -6,5 +6,6 @@ vif = [ "mac=aa:00:00:00:00:11, bridge=xenbr0" ]
disk = [ "file:/xen/fc4.img,sda1,w" ] disk = [ "file:/xen/fc4.img,sda1,w" ]
root = "/dev/sda1" root = "/dev/sda1"
extra = "ro selinux=0 3" extra = "ro selinux=0 3"
on_reboot = "restart"
# just for testing ... # just for testing ...
tst = [ 1, 2, [ 3, 4 ], 5 ] tst = [ 1, 2, [ 3, 4 ], 5 ]