aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-02 14:14:48 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-02 14:14:48 +0200
commit26b6ccf340243ec3acd594c6928b18e95d3deea9 (patch)
tree90955d90056adbd8724db164f7cbb3e56833ed8b /archival
parentabb154ba02f9a9a98465cb1f816f974cca536392 (diff)
downloadbusybox-w32-26b6ccf340243ec3acd594c6928b18e95d3deea9.tar.gz
busybox-w32-26b6ccf340243ec3acd594c6928b18e95d3deea9.tar.bz2
busybox-w32-26b6ccf340243ec3acd594c6928b18e95d3deea9.zip
*: simplify checks for gz/bz2/xz magic
function old new delta send_tree 360 355 -5 rpm2cpio_main 249 220 -29 setup_unzip_on_fd 150 118 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-66) Total: -66 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/rpm2cpio.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 598ec8670..1c67dcc6e 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -68,26 +68,31 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
68#else 68#else
69 /* BLOAT */ 69 /* BLOAT */
70 { 70 {
71 unsigned char magic[8]; 71 union {
72 uint8_t b[4];
73 uint16_t b16[2];
74 uint32_t b32[1];
75 } magic;
72 IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd); 76 IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
73 77
74 xread(rpm_fd, &magic, 2); 78 xread(rpm_fd, magic.b16, sizeof(magic.b16));
75 if (magic[0] == 0x1f && magic[1] == 0x8b) { 79 if (magic.b16[0] == GZIP_MAGIC) {
76 unpack = unpack_gz_stream; 80 unpack = unpack_gz_stream;
77 } else 81 } else
78 if (ENABLE_FEATURE_SEAMLESS_BZ2 82 if (ENABLE_FEATURE_SEAMLESS_BZ2
79 && magic[0] == 'B' && magic[1] == 'Z' 83 && magic.b16[0] == BZIP2_MAGIC
80 ) { 84 ) {
81 unpack = unpack_bz2_stream; 85 unpack = unpack_bz2_stream;
82 } else 86 } else
83 if (ENABLE_FEATURE_SEAMLESS_XZ 87 if (ENABLE_FEATURE_SEAMLESS_XZ
84 && magic[0] == 0xfd && magic[1] == '7' 88 && magic.b16[0] == XZ_MAGIC1
85 ) { 89 ) {
86 /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ 90 /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
87 /* More info at: http://tukaani.org/xz/xz-file-format.txt */ 91 /* More info at: http://tukaani.org/xz/xz-file-format.txt */
88 xread(rpm_fd, magic + 2, 4); 92 xread(rpm_fd, magic.b32, sizeof(magic.b32));
89 if (strcmp((char*)magic + 2, "zXZ") != 0) 93 if (magic.b32[0] != XZ_MAGIC2)
90 goto no_magic; 94 goto no_magic;
95 /* unpack_xz_stream wants fd at position 0 */
91 xlseek(rpm_fd, -6, SEEK_CUR); 96 xlseek(rpm_fd, -6, SEEK_CUR);
92 unpack = unpack_xz_stream; 97 unpack = unpack_xz_stream;
93 } else { 98 } else {