aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-26 05:01:16 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-26 05:01:16 +0200
commit894fa0ad62924bcfc2d37e045e36d25ad5784888 (patch)
tree0ebcf614981f9b2154ce35d663b76fc9526699f1 /archival
parent63144be7eae8757b0e0d81ff6fa8adb0b26ff7c1 (diff)
downloadbusybox-w32-894fa0ad62924bcfc2d37e045e36d25ad5784888.tar.gz
busybox-w32-894fa0ad62924bcfc2d37e045e36d25ad5784888.tar.bz2
busybox-w32-894fa0ad62924bcfc2d37e045e36d25ad5784888.zip
fix breakage in compressed file detection
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/rpm2cpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 1c67dcc6e..1f67fa887 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -75,7 +75,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
75 } magic; 75 } magic;
76 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);
77 77
78 xread(rpm_fd, magic.b16, sizeof(magic.b16)); 78 xread(rpm_fd, magic.b16, sizeof(magic.b16[0]));
79 if (magic.b16[0] == GZIP_MAGIC) { 79 if (magic.b16[0] == GZIP_MAGIC) {
80 unpack = unpack_gz_stream; 80 unpack = unpack_gz_stream;
81 } else 81 } else
@@ -89,7 +89,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
89 ) { 89 ) {
90 /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ 90 /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
91 /* More info at: http://tukaani.org/xz/xz-file-format.txt */ 91 /* More info at: http://tukaani.org/xz/xz-file-format.txt */
92 xread(rpm_fd, magic.b32, sizeof(magic.b32)); 92 xread(rpm_fd, magic.b32, sizeof(magic.b32[0]));
93 if (magic.b32[0] != XZ_MAGIC2) 93 if (magic.b32[0] != XZ_MAGIC2)
94 goto no_magic; 94 goto no_magic;
95 /* unpack_xz_stream wants fd at position 0 */ 95 /* unpack_xz_stream wants fd at position 0 */