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/parse.tests | |
parent | 8895c2073e9341d8e0348365e75ba6aa4b9b8d05 (diff) | |
download | busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.gz busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.bz2 busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.zip |
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/parse.tests')
-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 @@ | |||
5 | 5 | ||
6 | . testing.sh | 6 | . testing.sh |
7 | 7 | ||
8 | NO_REDUCE=65536 | 8 | COLLAPSE=$(( 0x00010000)) |
9 | NO_TRIM=131072 | 9 | TRIM=$(( 0x00020000)) |
10 | GREEDY=262144 | 10 | GREEDY=$(( 0x00040000)) |
11 | MIN_DIE=$(( 0x00100000)) | ||
12 | KEEP_COPY=$((0x00200000)) | ||
13 | ESCAPE=$(( 0x00400000)) | ||
14 | NORMAL=$(( COLLAPSE | TRIM | GREEDY)) | ||
11 | 15 | ||
12 | # testing "description" "command" "result" "infile" "stdin" | 16 | # testing "description" "command" "result" "infile" "stdin" |
13 | 17 | ||
14 | testing "mdev.conf" \ | 18 | testing "parse mdev.conf" \ |
15 | "parse -n 4 -m 3 -f $GREEDY -" \ | 19 | "parse -n 4 -m 3 -f $((NORMAL)) -" \ |
16 | "[sda][0:0][644][@echo @echo TEST]\n" \ | 20 | "[sda][0:0][644][@echo @echo TEST]\n" \ |
17 | "-" \ | 21 | "-" \ |
18 | " sda 0:0 644 @echo @echo TEST # echo trap\n" | 22 | " sda 0:0 644 @echo @echo TEST # echo trap\n" |
19 | 23 | ||
20 | testing "notrim" \ | 24 | testing "parse notrim" \ |
21 | "parse -n 4 -m 3 -f $(($GREEDY+$NO_TRIM)) -" \ | 25 | "parse -n 4 -m 3 -f $((NORMAL - TRIM - COLLAPSE)) -" \ |
22 | "[][sda][0:0][644 @echo @echo TEST ]\n" \ | 26 | "[][sda][0:0][644 @echo @echo TEST ]\n" \ |
23 | "-" \ | 27 | "-" \ |
24 | " sda 0:0 644 @echo @echo TEST \n" | 28 | " sda 0:0 644 @echo @echo TEST \n" |
@@ -49,12 +53,12 @@ cat >$FILE.res <<EOF | |||
49 | [/dev/cdrom][/cdrom][iso9660][ro,user,noauto,nohide][0][0] | 53 | [/dev/cdrom][/cdrom][iso9660][ro,user,noauto,nohide][0][0] |
50 | [/dev/hdb5][/redhat][ext2][rw,root,noauto,nohide][0][0] | 54 | [/dev/hdb5][/redhat][ext2][rw,root,noauto,nohide][0][0] |
51 | [/dev/hdb6][/win2home][ntfs][rw,root,noauto,nohide][0][0] | 55 | [/dev/hdb6][/win2home][ntfs][rw,root,noauto,nohide][0][0] |
52 | [/dev/hdb7][/win2skul][ntfs][rw,root,noauto,nohide][none][0] | 56 | [/dev/hdb7][/win2skul][ntfs][rw,root,noauto,nohide][none][0 0] |
53 | [none][/dev/pts][devpts][gid=5,mode=620][0][0] | 57 | [none][/dev/pts][devpts][gid=5,mode=620][0][0] |
54 | [none][/proc][proc][defaults][0][0] | 58 | [none][/proc][proc][defaults][0][0] |
55 | EOF | 59 | EOF |
56 | 60 | ||
57 | testing "polluted fstab" \ | 61 | testing "parse polluted fstab" \ |
58 | "parse -n 6 -m 6 $FILE" \ | 62 | "parse -n 6 -m 6 $FILE" \ |
59 | "`cat $FILE.res`\n" \ | 63 | "`cat $FILE.res`\n" \ |
60 | "" \ | 64 | "" \ |
@@ -74,8 +78,8 @@ cat >$FILE.res <<EOF | |||
74 | [][][shutdown][/sbin/swapoff -a] | 78 | [][][shutdown][/sbin/swapoff -a] |
75 | EOF | 79 | EOF |
76 | 80 | ||
77 | testing "inittab from examples" \ | 81 | testing "parse inittab from examples" \ |
78 | "parse -n 4 -m 4 -f $(($GREEDY+$NO_TRIM)) -d'#:' $FILE" \ | 82 | "parse -n 4 -m 4 -f $((NORMAL - TRIM - COLLAPSE)) -d'#:' $FILE" \ |
79 | "`cat $FILE.res`\n" \ | 83 | "`cat $FILE.res`\n" \ |
80 | "" \ | 84 | "" \ |
81 | "" | 85 | "" |
@@ -94,7 +98,7 @@ cat >$FILE.res <<EOF | |||
94 | [option][lease][864000] | 98 | [option][lease][864000] |
95 | EOF | 99 | EOF |
96 | 100 | ||
97 | testing "udhcpd.conf from examples" \ | 101 | testing "parse udhcpd.conf from examples" \ |
98 | "parse -n 127 $FILE" \ | 102 | "parse -n 127 $FILE" \ |
99 | "`cat $FILE.res`\n" \ | 103 | "`cat $FILE.res`\n" \ |
100 | "" \ | 104 | "" \ |