[git commit] do not store 1st two bytes of compressed help text

Denys Vlasenko vda.linux at googlemail.com
Thu Aug 20 21:34:01 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=263cff9a2f4480cd922ecff5e382e8fd804957eb
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 applets/usage_compressed |    2 +-
 libbb/appletlib.c        |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/applets/usage_compressed b/applets/usage_compressed
index c30bcfa..00c5735 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -24,7 +24,7 @@ echo 'static const char packed_usage[] ALIGN1 = {'
 ## | grep -v '^$' \
 ## | $SED -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
 
-"$loc/usage" | bzip2 -1 | od -v -t x1 \
+"$loc/usage" | bzip2 -1 | dd bs=2 skip=1 | od -v -t x1 \
 | $SED -e 's/^[^ ]*//' \
 | $SED -e 's/ //g' \
 | grep -v '^$' \
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 0feaef3..d239d98 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -73,8 +73,7 @@ static const char *unpack_usage_messages(void)
 
 	i = start_bunzip(&bd,
 			/* src_fd: */ -1,
-//FIXME: can avoid storing these 2 bytes!
-			/* inbuf:  */ (void *)packed_usage + 2,
+			/* inbuf:  */ (void *)packed_usage,
 			/* len:    */ sizeof(packed_usage));
 	/* read_bunzip can longjmp to start_bunzip, and ultimately
 	 * end up here with i != 0 on read data errors! Not trivial */
-- 
1.6.3.3



More information about the busybox-cvs mailing list