X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=applets%2Fusage_compressed;h=e1fd0d94df9009477f9b1488951e5cb6b3cf0de5;hb=1d36f24bcb22d06b007f162802cbc5a251f3e612;hp=551b4b4ba0d45be0e7bde1a9c8cf3f8d881785a4;hpb=937b10f35dc9fb74220ffa8d3f8e98f07f732f79;p=oweals%2Fbusybox.git

diff --git a/applets/usage_compressed b/applets/usage_compressed
index 551b4b4ba..e1fd0d94d 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -7,21 +7,37 @@ test "$target" || exit 1
 test "$loc" || loc=.
 test -x "$loc/usage" || exit 1
 test "$SED" || SED=sed
+test "$DD" || DD=dd
 
-sz=`"$loc/usage" | wc -c` || exit 1
+exec >"$target.$$"
 
-exec >"$target"
-
-echo 'static const char packed_usage[] ALIGN1 = {'
-
-# Extra effort to avoid using "od -t x1": -t is not available
-# in non-CONFIG_DESKTOPed busybox od
-
-"$loc/usage" | bzip2 -1 | od -v -x \
+echo '#define UNPACKED_USAGE "" \'
+"$loc/usage" | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' \
+	-e 's/ //g' \
+	-e '/^$/d' \
+	-e 's/\(..\)/\\x\1/g' \
+	-e 's/^/"/' \
+	-e 's/$/" \\/'
+echo ''
+
+echo '#define PACKED_USAGE \'
+## Breaks on big-endian systems!
+## # Extra effort to avoid using "od -t x1": -t is not available
+## # in non-CONFIG_DESKTOPed busybox od
+##
+## "$loc/usage" | bzip2 -1 | od -v -x \
+## | $SED -e 's/^[^ ]*//' \
+##	-e 's/ //g' \
+##	-e '/^$/d' \
+##	-e 's/\(..\)\(..\)/0x\2,0x\1,/g'
+##	-e 's/$/ \\/'
+"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \
 | $SED -e 's/^[^ ]*//' \
-| $SED -e 's/ //g' \
-| grep -v '^$' \
-| $SED -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
+	-e 's/ //g' \
+	-e '/^$/d' \
+	-e 's/\(..\)/0x\1,/g' \
+	-e 's/$/ \\/'
+echo ''
 
-echo '};'
-echo '#define SIZEOF_usage_messages' `expr 0 + $sz`
+mv -- "$target.$$" "$target"