do not store 1st two bytes of compressed help text

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/applets/usage_compressed b/applets/usage_compressed
index c30bcfa29b2a710a7e594eb23130f40b37b3dca0..00c5735fa203802f451126fa5983d29baa8563be 100755 (executable)
--- 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 0feaef3f3be761a759a2fa182d2f2e93b418690d..d239d986ba3e6461679051d61b8514ff062f7665 100644 (file)
--- 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 */