diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 23:08:31 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 23:08:31 +0000 |
commit | 084266ed520805bbc4ec3f9b4d14e644ecd75880 (patch) | |
tree | fe2c8531dc039c81c12a39f39fcfdf6c1b8ec996 /testsuite | |
parent | 8895c2073e9341d8e0348365e75ba6aa4b9b8d05 (diff) | |
download | busybox-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.gz |
fix several problems with config parser:
a bug where it underflows the string
a bug where it never frees parser_t struct
make read_config() return 0 if parser is NULL,
make config_close() accept and ignore NULL parser -
eliminates many if() blocks
reverse the sense of parser bit flags - negative flags
are harder to grok.
hexdump: revert the change to use config parser, it is BIGGER
and also requires additional quirks in parser
*: explicitly use PARSER_NORMAL instead of 0
function old new delta
login_main 1575 1596 +21
config_close 18 29 +11
bbunpack 383 391 +8
qgravechar 106 109 +3
rtnl_tab_initialize 121 117 -4
expand 1697 1693 -4
man_main 717 712 -5
nameif_main 674 668 -6
hexdump_main 597 591 -6
read_config 217 209 -8
dnsd_main 1478 1470 -8
sysctl_main 203 189 -14
config_open2 44 25 -19
make_device 1177 1141 -36
config_read 597 549 -48
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/11 up/down: 43/-158) Total: -115 bytes
Diffstat (limited to 'testsuite')
-rwxr-xr-x | testsuite/parse.tests | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/testsuite/parse.tests b/testsuite/parse.tests index 06be8d2b9..f1ee7b830 100755 --- a/testsuite/parse.tests +++ b/testsuite/parse.tests @@ -5,20 +5,24 @@ . testing.sh -NO_REDUCE=65536 -NO_TRIM=131072 -GREEDY=262144 +COLLAPSE=$(( 0x00010000)) +TRIM=$(( 0x00020000)) +GREEDY=$(( 0x00040000)) +MIN_DIE=$(( 0x00100000)) +KEEP_COPY=$((0x00200000)) +ESCAPE=$(( 0x00400000)) +NORMAL=$(( COLLAPSE | TRIM | GREEDY)) # testing "description" "command" "result" "infile" "stdin" -testing "mdev.conf" \ - "parse -n 4 -m 3 -f $GREEDY -" \ +testing "parse mdev.conf" \ + "parse -n 4 -m 3 -f $((NORMAL)) -" \ "[sda][0:0][644][@echo @echo TEST]\n" \ "-" \ " sda 0:0 644 @echo @echo TEST # echo trap\n" -testing "notrim" \ - "parse -n 4 -m 3 -f $(($GREEDY+$NO_TRIM)) -" \ +testing "parse notrim" \ + "parse -n 4 -m 3 -f $((NORMAL - TRIM - COLLAPSE)) -" \ "[][sda][0:0][644 @echo @echo TEST ]\n" \ "-" \ " sda 0:0 644 @echo @echo TEST \n" @@ -49,12 +53,12 @@ cat >$FILE.res <<EOF [/dev/cdrom][/cdrom][iso9660][ro,user,noauto,nohide][0][0] [/dev/hdb5][/redhat][ext2][rw,root,noauto,nohide][0][0] [/dev/hdb6][/win2home][ntfs][rw,root,noauto,nohide][0][0] -[/dev/hdb7][/win2skul][ntfs][rw,root,noauto,nohide][none][0] +[/dev/hdb7][/win2skul][ntfs][rw,root,noauto,nohide][none][0 0] [none][/dev/pts][devpts][gid=5,mode=620][0][0] [none][/proc][proc][defaults][0][0] EOF -testing "polluted fstab" \ +testing "parse polluted fstab" \ "parse -n 6 -m 6 $FILE" \ "`cat $FILE.res`\n" \ "" \ @@ -74,8 +78,8 @@ cat >$FILE.res <<EOF [][][shutdown][/sbin/swapoff -a] EOF -testing "inittab from examples" \ - "parse -n 4 -m 4 -f $(($GREEDY+$NO_TRIM)) -d'#:' $FILE" \ +testing "parse inittab from examples" \ + "parse -n 4 -m 4 -f $((NORMAL - TRIM - COLLAPSE)) -d'#:' $FILE" \ "`cat $FILE.res`\n" \ "" \ "" @@ -94,7 +98,7 @@ cat >$FILE.res <<EOF [option][lease][864000] EOF -testing "udhcpd.conf from examples" \ +testing "parse udhcpd.conf from examples" \ "parse -n 127 $FILE" \ "`cat $FILE.res`\n" \ "" \ |