Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

fix breakage in compressed file detection

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-26 05:01:16 +02:00
parent 63144be7ea
commit 894fa0ad62
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/rpm2cpio.c
View File

@ -75,7 +75,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
} magic; } magic;
IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd); IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
xread(rpm_fd, magic.b16, sizeof(magic.b16)); xread(rpm_fd, magic.b16, sizeof(magic.b16[0]));
if (magic.b16[0] == GZIP_MAGIC) { if (magic.b16[0] == GZIP_MAGIC) {
unpack = unpack_gz_stream; unpack = unpack_gz_stream;
} else } else
@ -89,7 +89,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
) { ) {
/* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
/* More info at: http://tukaani.org/xz/xz-file-format.txt */ /* More info at: http://tukaani.org/xz/xz-file-format.txt */
xread(rpm_fd, magic.b32, sizeof(magic.b32)); xread(rpm_fd, magic.b32, sizeof(magic.b32[0]));
if (magic.b32[0] != XZ_MAGIC2) if (magic.b32[0] != XZ_MAGIC2)
goto no_magic; goto no_magic;
/* unpack_xz_stream wants fd at position 0 */ /* unpack_xz_stream wants fd at position 0 */

4
libbb/read_printf.c
View File

@ -265,7 +265,7 @@ void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
/* .gz and .bz2 both have 2-byte signature, and their /* .gz and .bz2 both have 2-byte signature, and their
* unpack_XXX_stream wants this header skipped. */ * unpack_XXX_stream wants this header skipped. */
xread(fd, magic.b16, sizeof(magic.b16)); xread(fd, magic.b16, sizeof(magic.b16[0]));
if (ENABLE_FEATURE_SEAMLESS_GZ if (ENABLE_FEATURE_SEAMLESS_GZ
&& magic.b16[0] == GZIP_MAGIC && magic.b16[0] == GZIP_MAGIC
) { ) {
@ -292,7 +292,7 @@ void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
/* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
/* More info at: http://tukaani.org/xz/xz-file-format.txt */ /* More info at: http://tukaani.org/xz/xz-file-format.txt */
offset = -6; offset = -6;
xread(fd, magic.b32, sizeof(magic.b32)); xread(fd, magic.b32, sizeof(magic.b32[0]));
if (magic.b32[0] == XZ_MAGIC2) { if (magic.b32[0] == XZ_MAGIC2) {
# if BB_MMU # if BB_MMU
xformer = unpack_xz_stream; xformer = unpack_xz_stream;