emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consolidate xz format comment. no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-07-01 10:38:10 +02:00
parent 81199672be
commit cd0f6b0c93
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/rpm2cpio.c
View File

@ -87,8 +87,6 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
if (ENABLE_FEATURE_SEAMLESS_XZ if (ENABLE_FEATURE_SEAMLESS_XZ
&& magic.b16[0] == XZ_MAGIC1 && magic.b16[0] == XZ_MAGIC1
) { ) {
/* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
/* More info at: http://tukaani.org/xz/xz-file-format.txt */
xread(rpm_fd, magic.b32, sizeof(magic.b32[0])); 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;

2
include/unarchive.h
View File

@ -9,6 +9,8 @@ enum {
COMPRESS_MAGIC = 0x1f9d, COMPRESS_MAGIC = 0x1f9d,
GZIP_MAGIC = 0x1f8b, GZIP_MAGIC = 0x1f8b,
BZIP2_MAGIC = 'B' * 256 + 'Z', BZIP2_MAGIC = 'B' * 256 + 'Z',
/* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
/* More info at: http://tukaani.org/xz/xz-file-format.txt */
XZ_MAGIC1 = 0xfd * 256 + '7', XZ_MAGIC1 = 0xfd * 256 + '7',
XZ_MAGIC2 = (('z' * 256 + 'X') * 256 + 'Z') * 256 + 0, XZ_MAGIC2 = (('z' * 256 + 'X') * 256 + 'Z') * 256 + 0,
/* Different form: 32 bits, then 16 bits: */ /* Different form: 32 bits, then 16 bits: */

2
libbb/read_printf.c
View File

@ -289,8 +289,6 @@ void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
if (ENABLE_FEATURE_SEAMLESS_XZ if (ENABLE_FEATURE_SEAMLESS_XZ
&& magic.b16[0] == XZ_MAGIC1 && magic.b16[0] == XZ_MAGIC1
) { ) {
/* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
/* More info at: http://tukaani.org/xz/xz-file-format.txt */
offset = -6; offset = -6;
xread(fd, magic.b32, sizeof(magic.b32[0])); xread(fd, magic.b32, sizeof(magic.b32[0]));
if (magic.b32[0] == XZ_MAGIC2) { if (magic.b32[0] == XZ_MAGIC2) {