aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-08-20 23:34:01 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-08-20 23:34:01 +0200
commit263cff9a2f4480cd922ecff5e382e8fd804957eb (patch)
treeb8782e1a809d1dd6e40a5feeb7450d428aa564f9
parentd7874ed1d498454b3c7342f9e6df0aacb9873186 (diff)
downloadbusybox-w32-263cff9a2f4480cd922ecff5e382e8fd804957eb.tar.gz
busybox-w32-263cff9a2f4480cd922ecff5e382e8fd804957eb.tar.bz2
busybox-w32-263cff9a2f4480cd922ecff5e382e8fd804957eb.zip
do not store 1st two bytes of compressed help text
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xapplets/usage_compressed2
-rw-r--r--libbb/appletlib.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/applets/usage_compressed b/applets/usage_compressed
index c30bcfa29..00c5735fa 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -24,7 +24,7 @@ echo 'static const char packed_usage[] ALIGN1 = {'
24## | grep -v '^$' \ 24## | grep -v '^$' \
25## | $SED -e 's/\(..\)\(..\)/0x\2,0x\1,/g' 25## | $SED -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
26 26
27"$loc/usage" | bzip2 -1 | od -v -t x1 \ 27"$loc/usage" | bzip2 -1 | dd bs=2 skip=1 | od -v -t x1 \
28| $SED -e 's/^[^ ]*//' \ 28| $SED -e 's/^[^ ]*//' \
29| $SED -e 's/ //g' \ 29| $SED -e 's/ //g' \
30| grep -v '^$' \ 30| grep -v '^$' \
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 0feaef3f3..d239d986b 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -73,8 +73,7 @@ static const char *unpack_usage_messages(void)
73 73
74 i = start_bunzip(&bd, 74 i = start_bunzip(&bd,
75 /* src_fd: */ -1, 75 /* src_fd: */ -1,
76//FIXME: can avoid storing these 2 bytes! 76 /* inbuf: */ (void *)packed_usage,
77 /* inbuf: */ (void *)packed_usage + 2,
78 /* len: */ sizeof(packed_usage)); 77 /* len: */ sizeof(packed_usage));
79 /* read_bunzip can longjmp to start_bunzip, and ultimately 78 /* read_bunzip can longjmp to start_bunzip, and ultimately
80 * end up here with i != 0 on read data errors! Not trivial */ 79 * end up here with i != 0 on read data errors! Not trivial */