2002-01-02 19:22:26 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
|
|
|
/*
|
|
|
|
* Mini unzip implementation for busybox
|
|
|
|
*
|
2005-07-21 01:56:49 +05:30
|
|
|
* Copyright (C) 2004 by Ed Clark
|
|
|
|
*
|
|
|
|
* Loosely based on original busybox unzip applet by Laurence Anderson.
|
|
|
|
* All options and features should work in this version.
|
2002-01-02 19:22:26 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2002-01-02 19:22:26 +05:30
|
|
|
*/
|
2004-06-06 15:52:43 +05:30
|
|
|
/* For reference see
|
2005-07-21 01:56:49 +05:30
|
|
|
* http://www.pkware.com/company/standards/appnote/
|
2004-06-06 15:52:43 +05:30
|
|
|
* http://www.info-zip.org/pub/infozip/doc/appnote-iz-latest.zip
|
2013-11-14 14:23:52 +05:30
|
|
|
*
|
|
|
|
* TODO
|
2005-07-21 01:56:49 +05:30
|
|
|
* Zip64 + other methods
|
|
|
|
*/
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:config UNZIP
|
2018-12-28 07:50:17 +05:30
|
|
|
//config: bool "unzip (26 kb)"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: unzip will list or extract files from a ZIP archive,
|
|
|
|
//config: commonly found on DOS/WIN systems. The default behavior
|
|
|
|
//config: (with no options) is to extract the archive into the
|
|
|
|
//config: current directory.
|
2017-01-05 16:13:53 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_UNZIP_CDF
|
|
|
|
//config: bool "Read and use Central Directory data"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on UNZIP
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: If you know that you only need to deal with simple
|
|
|
|
//config: ZIP files without deleted/updated files, SFX archives etc,
|
|
|
|
//config: you can reduce code size by unselecting this option.
|
|
|
|
//config: To support less trivial ZIPs, say Y.
|
2017-01-09 15:28:37 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_UNZIP_BZIP2
|
|
|
|
//config: bool "Support compression method 12 (bzip2)"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on FEATURE_UNZIP_CDF && DESKTOP
|
|
|
|
// FEATURE_UNZIP_CDF is needed, otherwise we can't find start of next file
|
|
|
|
// DESKTOP is needed to get back uncompressed length
|
|
|
|
//config:
|
|
|
|
//config:config FEATURE_UNZIP_LZMA
|
|
|
|
//config: bool "Support compression method 14 (lzma)"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on FEATURE_UNZIP_CDF && DESKTOP
|
2017-01-09 15:42:01 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_UNZIP_XZ
|
|
|
|
//config: bool "Support compression method 95 (xz)"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on FEATURE_UNZIP_CDF && DESKTOP
|
2013-11-14 16:09:00 +05:30
|
|
|
|
2013-11-14 16:08:18 +05:30
|
|
|
//applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP))
|
2013-11-14 14:23:52 +05:30
|
|
|
//kbuild:lib-$(CONFIG_UNZIP) += unzip.o
|
|
|
|
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage:#define unzip_trivial_usage
|
2017-11-07 12:33:37 +05:30
|
|
|
//usage: "[-lnojpq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage:#define unzip_full_usage "\n\n"
|
2012-06-19 16:16:59 +05:30
|
|
|
//usage: "Extract FILEs from ZIP archive\n"
|
|
|
|
//usage: "\n -l List contents (with -q for short form)"
|
2012-06-15 20:13:26 +05:30
|
|
|
//usage: "\n -n Never overwrite files (default: ask)"
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage: "\n -o Overwrite"
|
2017-07-20 23:34:49 +05:30
|
|
|
//usage: "\n -j Do not restore paths"
|
2021-06-13 04:38:48 +05:30
|
|
|
//usage: "\n -p Write to stdout"
|
2021-04-15 01:04:00 +05:30
|
|
|
//usage: "\n -t Test"
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage: "\n -q Quiet"
|
2012-06-19 16:16:59 +05:30
|
|
|
//usage: "\n -x FILE Exclude FILEs"
|
|
|
|
//usage: "\n -d DIR Extract into DIR"
|
2011-03-28 02:10:30 +05:30
|
|
|
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2011-09-22 16:15:14 +05:30
|
|
|
#include "bb_archive.h"
|
2002-01-02 19:22:26 +05:30
|
|
|
|
2016-04-18 00:35:34 +05:30
|
|
|
#if 0
|
|
|
|
# define dbg(...) bb_error_msg(__VA_ARGS__)
|
|
|
|
#else
|
|
|
|
# define dbg(...) ((void)0)
|
|
|
|
#endif
|
|
|
|
|
2007-10-19 04:57:46 +05:30
|
|
|
enum {
|
|
|
|
#if BB_BIG_ENDIAN
|
|
|
|
ZIP_FILEHEADER_MAGIC = 0x504b0304,
|
2017-01-08 18:44:19 +05:30
|
|
|
ZIP_CDF_MAGIC = 0x504b0102, /* CDF item */
|
|
|
|
ZIP_CDE_MAGIC = 0x504b0506, /* End of CDF */
|
2021-04-15 00:45:25 +05:30
|
|
|
ZIP64_CDE_MAGIC = 0x504b0606, /* End of Zip64 CDF */
|
2007-10-19 04:57:46 +05:30
|
|
|
ZIP_DD_MAGIC = 0x504b0708,
|
|
|
|
#else
|
|
|
|
ZIP_FILEHEADER_MAGIC = 0x04034b50,
|
2010-05-24 08:03:02 +05:30
|
|
|
ZIP_CDF_MAGIC = 0x02014b50,
|
2008-09-21 06:31:46 +05:30
|
|
|
ZIP_CDE_MAGIC = 0x06054b50,
|
2021-04-15 00:45:25 +05:30
|
|
|
ZIP64_CDE_MAGIC = 0x06064b50,
|
2007-10-19 04:57:46 +05:30
|
|
|
ZIP_DD_MAGIC = 0x08074b50,
|
|
|
|
#endif
|
|
|
|
};
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2007-11-06 04:39:03 +05:30
|
|
|
#define ZIP_HEADER_LEN 26
|
|
|
|
|
2005-07-21 01:56:49 +05:30
|
|
|
typedef union {
|
2007-11-06 04:39:03 +05:30
|
|
|
uint8_t raw[ZIP_HEADER_LEN];
|
2005-07-21 01:56:49 +05:30
|
|
|
struct {
|
2008-09-21 06:31:46 +05:30
|
|
|
uint16_t version; /* 0-1 */
|
2010-05-24 08:16:18 +05:30
|
|
|
uint16_t zip_flags; /* 2-3 */
|
2008-09-21 06:31:46 +05:30
|
|
|
uint16_t method; /* 4-5 */
|
|
|
|
uint16_t modtime; /* 6-7 */
|
|
|
|
uint16_t moddate; /* 8-9 */
|
|
|
|
uint32_t crc32 PACKED; /* 10-13 */
|
|
|
|
uint32_t cmpsize PACKED; /* 14-17 */
|
|
|
|
uint32_t ucmpsize PACKED; /* 18-21 */
|
|
|
|
uint16_t filename_len; /* 22-23 */
|
|
|
|
uint16_t extra_len; /* 24-25 */
|
2017-01-05 16:13:53 +05:30
|
|
|
/* filename follows (not NUL terminated) */
|
|
|
|
/* extra field follows */
|
|
|
|
/* data follows */
|
2017-01-08 18:44:19 +05:30
|
|
|
} fmt PACKED;
|
2008-07-05 14:48:54 +05:30
|
|
|
} zip_header_t; /* PACKED - gcc 4.2.1 doesn't like it (spews warning) */
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
#define FIX_ENDIANNESS_ZIP(zip) \
|
2017-01-05 16:13:53 +05:30
|
|
|
do { if (BB_BIG_ENDIAN) { \
|
2017-07-26 00:14:50 +05:30
|
|
|
(zip).fmt.method = SWAP_LE16((zip).fmt.method ); \
|
2017-01-08 18:44:19 +05:30
|
|
|
(zip).fmt.crc32 = SWAP_LE32((zip).fmt.crc32 ); \
|
|
|
|
(zip).fmt.cmpsize = SWAP_LE32((zip).fmt.cmpsize ); \
|
|
|
|
(zip).fmt.ucmpsize = SWAP_LE32((zip).fmt.ucmpsize ); \
|
|
|
|
(zip).fmt.filename_len = SWAP_LE16((zip).fmt.filename_len); \
|
|
|
|
(zip).fmt.extra_len = SWAP_LE16((zip).fmt.extra_len ); \
|
2017-01-05 16:13:53 +05:30
|
|
|
}} while (0)
|
2007-10-19 04:57:46 +05:30
|
|
|
|
2010-05-24 08:03:02 +05:30
|
|
|
#define CDF_HEADER_LEN 42
|
2008-09-21 06:31:46 +05:30
|
|
|
|
|
|
|
typedef union {
|
2010-05-24 08:03:02 +05:30
|
|
|
uint8_t raw[CDF_HEADER_LEN];
|
2008-09-21 06:31:46 +05:30
|
|
|
struct {
|
|
|
|
/* uint32_t signature; 50 4b 01 02 */
|
|
|
|
uint16_t version_made_by; /* 0-1 */
|
|
|
|
uint16_t version_needed; /* 2-3 */
|
2010-05-24 08:03:02 +05:30
|
|
|
uint16_t cdf_flags; /* 4-5 */
|
2008-09-21 06:31:46 +05:30
|
|
|
uint16_t method; /* 6-7 */
|
2017-01-05 16:13:53 +05:30
|
|
|
uint16_t modtime; /* 8-9 */
|
|
|
|
uint16_t moddate; /* 10-11 */
|
2008-09-21 06:31:46 +05:30
|
|
|
uint32_t crc32; /* 12-15 */
|
|
|
|
uint32_t cmpsize; /* 16-19 */
|
|
|
|
uint32_t ucmpsize; /* 20-23 */
|
2017-01-08 18:44:19 +05:30
|
|
|
uint16_t filename_len; /* 24-25 */
|
|
|
|
uint16_t extra_len; /* 26-27 */
|
2008-09-21 06:31:46 +05:30
|
|
|
uint16_t file_comment_length; /* 28-29 */
|
|
|
|
uint16_t disk_number_start; /* 30-31 */
|
2017-01-08 18:44:19 +05:30
|
|
|
uint16_t internal_attributes; /* 32-33 */
|
|
|
|
uint32_t external_attributes PACKED; /* 34-37 */
|
2008-09-21 06:31:46 +05:30
|
|
|
uint32_t relative_offset_of_local_header PACKED; /* 38-41 */
|
2017-01-05 16:13:53 +05:30
|
|
|
/* filename follows (not NUL terminated) */
|
|
|
|
/* extra field follows */
|
2017-01-08 18:44:19 +05:30
|
|
|
/* file comment follows */
|
|
|
|
} fmt PACKED;
|
2010-05-24 08:03:02 +05:30
|
|
|
} cdf_header_t;
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
#define FIX_ENDIANNESS_CDF(cdf) \
|
2017-01-05 16:13:53 +05:30
|
|
|
do { if (BB_BIG_ENDIAN) { \
|
2017-01-08 18:44:19 +05:30
|
|
|
(cdf).fmt.version_made_by = SWAP_LE16((cdf).fmt.version_made_by); \
|
2018-09-30 20:26:56 +05:30
|
|
|
(cdf).fmt.version_needed = SWAP_LE16((cdf).fmt.version_needed ); \
|
|
|
|
(cdf).fmt.method = SWAP_LE16((cdf).fmt.method ); \
|
|
|
|
(cdf).fmt.modtime = SWAP_LE16((cdf).fmt.modtime ); \
|
|
|
|
(cdf).fmt.moddate = SWAP_LE16((cdf).fmt.moddate ); \
|
|
|
|
(cdf).fmt.crc32 = SWAP_LE32((cdf).fmt.crc32 ); \
|
|
|
|
(cdf).fmt.cmpsize = SWAP_LE32((cdf).fmt.cmpsize ); \
|
|
|
|
(cdf).fmt.ucmpsize = SWAP_LE32((cdf).fmt.ucmpsize ); \
|
|
|
|
(cdf).fmt.filename_len = SWAP_LE16((cdf).fmt.filename_len ); \
|
|
|
|
(cdf).fmt.extra_len = SWAP_LE16((cdf).fmt.extra_len ); \
|
2017-01-08 18:44:19 +05:30
|
|
|
(cdf).fmt.file_comment_length = SWAP_LE16((cdf).fmt.file_comment_length); \
|
|
|
|
(cdf).fmt.external_attributes = SWAP_LE32((cdf).fmt.external_attributes); \
|
2017-01-05 16:13:53 +05:30
|
|
|
}} while (0)
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
#define CDE_LEN 16
|
2008-09-21 06:31:46 +05:30
|
|
|
|
|
|
|
typedef union {
|
2017-01-08 18:44:19 +05:30
|
|
|
uint8_t raw[CDE_LEN];
|
2008-09-21 06:31:46 +05:30
|
|
|
struct {
|
|
|
|
/* uint32_t signature; 50 4b 05 06 */
|
|
|
|
uint16_t this_disk_no;
|
2010-05-24 08:03:02 +05:30
|
|
|
uint16_t disk_with_cdf_no;
|
|
|
|
uint16_t cdf_entries_on_this_disk;
|
|
|
|
uint16_t cdf_entries_total;
|
|
|
|
uint32_t cdf_size;
|
|
|
|
uint32_t cdf_offset;
|
2017-01-08 18:44:19 +05:30
|
|
|
/* uint16_t archive_comment_length; */
|
|
|
|
/* archive comment follows */
|
|
|
|
} fmt PACKED;
|
|
|
|
} cde_t;
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
#define FIX_ENDIANNESS_CDE(cde) \
|
2017-01-05 16:13:53 +05:30
|
|
|
do { if (BB_BIG_ENDIAN) { \
|
2017-01-08 18:44:19 +05:30
|
|
|
(cde).fmt.cdf_offset = SWAP_LE32((cde).fmt.cdf_offset); \
|
2017-01-05 16:13:53 +05:30
|
|
|
}} while (0)
|
|
|
|
|
|
|
|
struct BUG {
|
|
|
|
/* Check the offset of the last element, not the length. This leniency
|
|
|
|
* allows for poor packing, whereby the overall struct may be too long,
|
|
|
|
* even though the elements are all in the right place.
|
|
|
|
*/
|
|
|
|
char BUG_zip_header_must_be_26_bytes[
|
2017-01-08 18:44:19 +05:30
|
|
|
offsetof(zip_header_t, fmt.extra_len) + 2
|
2017-01-05 16:13:53 +05:30
|
|
|
== ZIP_HEADER_LEN ? 1 : -1];
|
|
|
|
char BUG_cdf_header_must_be_42_bytes[
|
2017-01-08 18:44:19 +05:30
|
|
|
offsetof(cdf_header_t, fmt.relative_offset_of_local_header) + 4
|
2017-01-05 16:13:53 +05:30
|
|
|
== CDF_HEADER_LEN ? 1 : -1];
|
2017-01-08 18:44:19 +05:30
|
|
|
char BUG_cde_must_be_16_bytes[
|
|
|
|
sizeof(cde_t) == CDE_LEN ? 1 : -1];
|
2008-09-21 06:31:46 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
enum { zip_fd = 3 };
|
|
|
|
|
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
/* This value means that we failed to find CDF */
|
|
|
|
#define BAD_CDF_OFFSET ((uint32_t)0xffffffff)
|
|
|
|
|
|
|
|
#if !ENABLE_FEATURE_UNZIP_CDF
|
2010-06-18 10:09:44 +05:30
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
# define find_cdf_offset() BAD_CDF_OFFSET
|
|
|
|
|
|
|
|
#else
|
2013-07-20 18:50:46 +05:30
|
|
|
/* Seen in the wild:
|
|
|
|
* Self-extracting PRO2K3XP_32.exe contains 19078464 byte zip archive,
|
|
|
|
* where CDE was nearly 48 kbytes before EOF.
|
|
|
|
* (Surprisingly, it also apparently has *another* CDE structure
|
|
|
|
* closer to the end, with bogus cdf_offset).
|
|
|
|
* To make extraction work, bumped PEEK_FROM_END from 16k to 64k.
|
|
|
|
*/
|
|
|
|
#define PEEK_FROM_END (64*1024)
|
2008-09-21 06:31:46 +05:30
|
|
|
/* NB: does not preserve file position! */
|
2010-05-24 08:03:02 +05:30
|
|
|
static uint32_t find_cdf_offset(void)
|
2008-09-21 06:31:46 +05:30
|
|
|
{
|
2017-01-08 18:44:19 +05:30
|
|
|
cde_t cde;
|
2017-01-05 16:13:53 +05:30
|
|
|
unsigned char *buf;
|
2008-09-21 06:31:46 +05:30
|
|
|
unsigned char *p;
|
|
|
|
off_t end;
|
2016-04-18 00:35:34 +05:30
|
|
|
uint32_t found;
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
end = lseek(zip_fd, 0, SEEK_END);
|
|
|
|
if (end == (off_t) -1)
|
|
|
|
return BAD_CDF_OFFSET;
|
|
|
|
|
2010-06-18 10:09:44 +05:30
|
|
|
end -= PEEK_FROM_END;
|
2010-05-24 16:37:55 +05:30
|
|
|
if (end < 0)
|
|
|
|
end = 0;
|
2017-01-05 16:13:53 +05:30
|
|
|
|
2016-04-18 00:35:34 +05:30
|
|
|
dbg("Looking for cdf_offset starting from 0x%"OFF_FMT"x", end);
|
2017-03-24 19:30:12 +05:30
|
|
|
xlseek(zip_fd, end, SEEK_SET);
|
2017-01-05 16:13:53 +05:30
|
|
|
buf = xzalloc(PEEK_FROM_END);
|
2010-06-18 10:09:44 +05:30
|
|
|
full_read(zip_fd, buf, PEEK_FROM_END);
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2016-04-18 00:35:34 +05:30
|
|
|
found = BAD_CDF_OFFSET;
|
2008-09-21 06:31:46 +05:30
|
|
|
p = buf;
|
2017-01-08 18:44:19 +05:30
|
|
|
while (p <= buf + PEEK_FROM_END - CDE_LEN - 4) {
|
2008-09-21 06:31:46 +05:30
|
|
|
if (*p != 'P') {
|
|
|
|
p++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (*++p != 'K')
|
|
|
|
continue;
|
|
|
|
if (*++p != 5)
|
|
|
|
continue;
|
|
|
|
if (*++p != 6)
|
|
|
|
continue;
|
|
|
|
/* we found CDE! */
|
2017-01-08 18:44:19 +05:30
|
|
|
memcpy(cde.raw, p + 1, CDE_LEN);
|
2021-04-15 00:45:25 +05:30
|
|
|
dbg("cde.this_disk_no:%d", cde.fmt.this_disk_no );
|
|
|
|
dbg("cde.disk_with_cdf_no:%d", cde.fmt.disk_with_cdf_no );
|
|
|
|
dbg("cde.cdf_entries_on_this_disk:%d", cde.fmt.cdf_entries_on_this_disk);
|
|
|
|
dbg("cde.cdf_entries_total:%d", cde.fmt.cdf_entries_total );
|
|
|
|
dbg("cde.cdf_size:%d", cde.fmt.cdf_size );
|
|
|
|
dbg("cde.cdf_offset:%x", cde.fmt.cdf_offset );
|
2017-01-08 18:44:19 +05:30
|
|
|
FIX_ENDIANNESS_CDE(cde);
|
2013-07-21 06:01:08 +05:30
|
|
|
/*
|
|
|
|
* I've seen .ZIP files with seemingly valid CDEs
|
|
|
|
* where cdf_offset points past EOF - ??
|
2016-04-18 00:35:34 +05:30
|
|
|
* This check ignores such CDEs:
|
2013-07-21 06:01:08 +05:30
|
|
|
*/
|
2017-01-08 18:44:19 +05:30
|
|
|
if (cde.fmt.cdf_offset < end + (p - buf)) {
|
|
|
|
found = cde.fmt.cdf_offset;
|
2016-04-18 00:35:34 +05:30
|
|
|
dbg("Possible cdf_offset:0x%x at 0x%"OFF_FMT"x",
|
|
|
|
(unsigned)found, end + (p-3 - buf));
|
|
|
|
dbg(" cdf_offset+cdf_size:0x%x",
|
2017-01-08 18:44:19 +05:30
|
|
|
(unsigned)(found + SWAP_LE32(cde.fmt.cdf_size)));
|
2016-04-18 00:35:34 +05:30
|
|
|
/*
|
|
|
|
* We do not "break" here because only the last CDE is valid.
|
|
|
|
* I've seen a .zip archive which contained a .zip file,
|
|
|
|
* uncompressed, and taking the first CDE was using
|
|
|
|
* the CDE inside that file!
|
|
|
|
*/
|
|
|
|
}
|
2008-09-21 06:31:46 +05:30
|
|
|
}
|
2013-07-21 06:01:08 +05:30
|
|
|
free(buf);
|
2016-04-18 00:35:34 +05:30
|
|
|
dbg("Found cdf_offset:0x%x", (unsigned)found);
|
|
|
|
return found;
|
2008-09-21 06:31:46 +05:30
|
|
|
};
|
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf)
|
2002-09-25 08:17:48 +05:30
|
|
|
{
|
2017-01-05 16:13:53 +05:30
|
|
|
uint32_t magic;
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
if (cdf_offset == BAD_CDF_OFFSET)
|
|
|
|
return cdf_offset;
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
dbg("Reading CDF at 0x%x", (unsigned)cdf_offset);
|
|
|
|
xlseek(zip_fd, cdf_offset, SEEK_SET);
|
|
|
|
xread(zip_fd, &magic, 4);
|
2017-01-08 18:44:19 +05:30
|
|
|
/* Central Directory End? Assume CDF has ended.
|
|
|
|
* (more correct method is to use cde.cdf_entries_total counter)
|
|
|
|
*/
|
2017-01-05 16:13:53 +05:30
|
|
|
if (magic == ZIP_CDE_MAGIC) {
|
|
|
|
dbg("got ZIP_CDE_MAGIC");
|
|
|
|
return 0; /* EOF */
|
2013-07-21 06:01:08 +05:30
|
|
|
}
|
2021-04-15 00:45:25 +05:30
|
|
|
if (magic == ZIP64_CDE_MAGIC) { /* seen in .zip with >4GB files */
|
|
|
|
dbg("got ZIP64_CDE_MAGIC");
|
|
|
|
return 0; /* EOF */
|
|
|
|
}
|
2017-01-08 18:44:19 +05:30
|
|
|
xread(zip_fd, cdf->raw, CDF_HEADER_LEN);
|
2017-01-05 16:13:53 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
FIX_ENDIANNESS_CDF(*cdf);
|
2021-04-15 00:45:25 +05:30
|
|
|
dbg(" magic:%08x filename_len:%u extra_len:%u file_comment_length:%u",
|
|
|
|
magic,
|
2017-01-08 18:44:19 +05:30
|
|
|
(unsigned)cdf->fmt.filename_len,
|
|
|
|
(unsigned)cdf->fmt.extra_len,
|
|
|
|
(unsigned)cdf->fmt.file_comment_length
|
2017-01-05 16:13:53 +05:30
|
|
|
);
|
2021-04-15 00:45:25 +05:30
|
|
|
//TODO: require that magic == ZIP_CDF_MAGIC?
|
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
cdf_offset += 4 + CDF_HEADER_LEN
|
2017-01-08 18:44:19 +05:30
|
|
|
+ cdf->fmt.filename_len
|
|
|
|
+ cdf->fmt.extra_len
|
|
|
|
+ cdf->fmt.file_comment_length;
|
2008-09-21 06:31:46 +05:30
|
|
|
|
2021-04-15 00:45:25 +05:30
|
|
|
dbg("Next cdf_offset 0x%x", cdf_offset);
|
2010-05-24 08:03:02 +05:30
|
|
|
return cdf_offset;
|
2008-09-21 06:31:46 +05:30
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2017-07-20 23:51:50 +05:30
|
|
|
static void die_if_bad_fnamesize(unsigned sz)
|
|
|
|
{
|
|
|
|
if (sz > 0xfff) /* more than 4k?! no funny business please */
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("bad archive");
|
2017-07-20 23:51:50 +05:30
|
|
|
}
|
|
|
|
|
2008-09-21 06:31:46 +05:30
|
|
|
static void unzip_skip(off_t skip)
|
|
|
|
{
|
2013-07-21 06:01:08 +05:30
|
|
|
if (skip != 0)
|
|
|
|
if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1)
|
|
|
|
bb_copyfd_exact_size(zip_fd, -1, skip);
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
|
|
|
|
2007-10-19 04:57:46 +05:30
|
|
|
static void unzip_create_leading_dirs(const char *fn)
|
2005-07-21 01:56:49 +05:30
|
|
|
{
|
|
|
|
/* Create all leading directories */
|
2006-08-03 21:11:12 +05:30
|
|
|
char *name = xstrdup(fn);
|
2018-02-06 22:29:32 +05:30
|
|
|
|
|
|
|
/* mode of -1: set mode according to umask */
|
|
|
|
if (bb_make_directory(dirname(name), -1, FILEUTILS_RECUR)) {
|
2011-09-09 21:00:55 +05:30
|
|
|
xfunc_die(); /* bb_make_directory is noisy */
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
2005-07-21 01:56:49 +05:30
|
|
|
free(name);
|
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2017-07-20 22:26:05 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
2018-02-20 20:27:45 +05:30
|
|
|
static void unzip_extract_symlink(llist_t **symlink_placeholders,
|
|
|
|
zip_header_t *zip,
|
|
|
|
const char *dst_fn)
|
2017-07-20 22:04:51 +05:30
|
|
|
{
|
|
|
|
char *target;
|
|
|
|
|
2017-07-20 23:51:50 +05:30
|
|
|
die_if_bad_fnamesize(zip->fmt.ucmpsize);
|
2017-07-20 22:04:51 +05:30
|
|
|
|
|
|
|
if (zip->fmt.method == 0) {
|
|
|
|
/* Method 0 - stored (not compressed) */
|
|
|
|
target = xzalloc(zip->fmt.ucmpsize + 1);
|
|
|
|
xread(zip_fd, target, zip->fmt.ucmpsize);
|
|
|
|
} else {
|
|
|
|
#if 1
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("compressed symlink is not supported");
|
2017-07-20 22:04:51 +05:30
|
|
|
#else
|
|
|
|
transformer_state_t xstate;
|
|
|
|
init_transformer_state(&xstate);
|
|
|
|
xstate.mem_output_size_max = zip->fmt.ucmpsize;
|
|
|
|
/* ...unpack... */
|
|
|
|
if (!xstate.mem_output_buf)
|
|
|
|
WTF();
|
|
|
|
target = xstate.mem_output_buf;
|
|
|
|
target = xrealloc(target, xstate.mem_output_size + 1);
|
|
|
|
target[xstate.mem_output_size] = '\0';
|
|
|
|
#endif
|
|
|
|
}
|
2018-05-22 21:04:31 +05:30
|
|
|
create_or_remember_link(symlink_placeholders,
|
2018-02-20 20:27:45 +05:30
|
|
|
target,
|
2018-05-22 21:04:31 +05:30
|
|
|
dst_fn,
|
|
|
|
0);
|
2017-07-20 22:04:51 +05:30
|
|
|
free(target);
|
|
|
|
}
|
2017-07-20 22:26:05 +05:30
|
|
|
#endif
|
2017-07-20 22:04:51 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
static void unzip_extract(zip_header_t *zip, int dst_fd)
|
2005-07-21 01:56:49 +05:30
|
|
|
{
|
2017-01-09 15:28:37 +05:30
|
|
|
transformer_state_t xstate;
|
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
if (zip->fmt.method == 0) {
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Method 0 - stored (not compressed) */
|
2017-01-08 18:44:19 +05:30
|
|
|
off_t size = zip->fmt.ucmpsize;
|
2006-12-22 05:51:07 +05:30
|
|
|
if (size)
|
2008-09-21 06:31:46 +05:30
|
|
|
bb_copyfd_exact_size(zip_fd, dst_fd, size);
|
2017-01-09 15:28:37 +05:30
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
init_transformer_state(&xstate);
|
|
|
|
xstate.bytes_in = zip->fmt.cmpsize;
|
|
|
|
xstate.src_fd = zip_fd;
|
|
|
|
xstate.dst_fd = dst_fd;
|
|
|
|
if (zip->fmt.method == 8) {
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Method 8 - inflate */
|
2014-12-07 05:14:00 +05:30
|
|
|
if (inflate_unzip(&xstate) < 0)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("inflate error");
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Validate decompression - crc */
|
2017-01-08 18:44:19 +05:30
|
|
|
if (zip->fmt.crc32 != (xstate.crc32 ^ 0xffffffffL)) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("crc error");
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
|
|
|
}
|
2017-01-09 15:28:37 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_BZIP2
|
|
|
|
else if (zip->fmt.method == 12) {
|
|
|
|
/* Tested. Unpacker reads too much, but we use CDF
|
|
|
|
* and will seek to the correct beginning of next file.
|
|
|
|
*/
|
|
|
|
xstate.bytes_out = unpack_bz2_stream(&xstate);
|
|
|
|
if (xstate.bytes_out < 0)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("inflate error");
|
2017-01-09 15:28:37 +05:30
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if ENABLE_FEATURE_UNZIP_LZMA
|
|
|
|
else if (zip->fmt.method == 14) {
|
|
|
|
/* Not tested yet */
|
|
|
|
xstate.bytes_out = unpack_lzma_stream(&xstate);
|
|
|
|
if (xstate.bytes_out < 0)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("inflate error");
|
2017-01-09 15:28:37 +05:30
|
|
|
}
|
2017-01-09 15:42:01 +05:30
|
|
|
#endif
|
|
|
|
#if ENABLE_FEATURE_UNZIP_XZ
|
|
|
|
else if (zip->fmt.method == 95) {
|
|
|
|
/* Not tested yet */
|
|
|
|
xstate.bytes_out = unpack_xz_stream(&xstate);
|
|
|
|
if (xstate.bytes_out < 0)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("inflate error");
|
2017-01-09 15:42:01 +05:30
|
|
|
}
|
2017-01-09 15:28:37 +05:30
|
|
|
#endif
|
|
|
|
else {
|
|
|
|
bb_error_msg_and_die("unsupported method %u", zip->fmt.method);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Validate decompression - size */
|
2021-04-15 00:45:25 +05:30
|
|
|
if (zip->fmt.ucmpsize != 0xffffffff /* seen on files with >4GB uncompressed data */
|
|
|
|
&& zip->fmt.ucmpsize != xstate.bytes_out
|
|
|
|
) {
|
2017-01-09 15:28:37 +05:30
|
|
|
/* Don't die. Who knows, maybe len calculation
|
|
|
|
* was botched somewhere. After all, crc matched! */
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("bad length");
|
2017-01-09 15:28:37 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
|
|
|
|
2013-01-22 15:46:08 +05:30
|
|
|
static void my_fgets80(char *buf80)
|
|
|
|
{
|
|
|
|
fflush_all();
|
|
|
|
if (!fgets(buf80, 80, stdin)) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg_and_die("can't read standard input");
|
2013-01-22 15:46:08 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-20 22:26:05 +05:30
|
|
|
static int get_lstat_mode(const char *dst_fn)
|
|
|
|
{
|
|
|
|
struct stat stat_buf;
|
|
|
|
if (lstat(dst_fn, &stat_buf) == -1) {
|
|
|
|
if (errno != ENOENT) {
|
2018-09-30 20:26:56 +05:30
|
|
|
bb_perror_msg_and_die("can't stat '%s'",
|
|
|
|
dst_fn
|
|
|
|
);
|
2017-07-20 22:26:05 +05:30
|
|
|
}
|
|
|
|
/* File does not exist */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return stat_buf.st_mode;
|
|
|
|
}
|
|
|
|
|
2007-10-11 15:35:36 +05:30
|
|
|
int unzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2006-03-07 02:17:33 +05:30
|
|
|
int unzip_main(int argc, char **argv)
|
2002-01-02 19:22:26 +05:30
|
|
|
{
|
2017-07-20 23:34:49 +05:30
|
|
|
enum {
|
|
|
|
OPT_l = (1 << 0),
|
|
|
|
OPT_x = (1 << 1),
|
|
|
|
OPT_j = (1 << 2),
|
|
|
|
};
|
|
|
|
unsigned opts;
|
2009-09-06 20:22:50 +05:30
|
|
|
smallint quiet = 0;
|
2017-01-05 16:13:53 +05:30
|
|
|
IF_NOT_FEATURE_UNZIP_CDF(const) smallint verbose = 0;
|
2017-07-20 23:34:49 +05:30
|
|
|
enum { O_PROMPT, O_NEVER, O_ALWAYS };
|
2007-10-19 04:57:46 +05:30
|
|
|
smallint overwrite = O_PROMPT;
|
2010-05-24 08:03:02 +05:30
|
|
|
uint32_t cdf_offset;
|
2009-09-06 20:22:50 +05:30
|
|
|
unsigned long total_usize;
|
|
|
|
unsigned long total_size;
|
2007-10-19 04:57:46 +05:30
|
|
|
unsigned total_entries;
|
|
|
|
int dst_fd = -1;
|
|
|
|
char *src_fn = NULL;
|
|
|
|
char *dst_fn = NULL;
|
2005-07-30 13:00:26 +05:30
|
|
|
llist_t *zaccept = NULL;
|
|
|
|
llist_t *zreject = NULL;
|
2002-09-25 08:17:48 +05:30
|
|
|
char *base_dir = NULL;
|
2018-02-20 20:27:45 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
|
|
|
llist_t *symlink_placeholders = NULL;
|
|
|
|
#endif
|
2017-07-20 23:34:49 +05:30
|
|
|
int i;
|
2013-01-22 15:46:08 +05:30
|
|
|
char key_buf[80]; /* must match size used by my_fgets80 */
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2009-09-06 20:22:50 +05:30
|
|
|
/* -q, -l and -v: UnZip 5.52 of 28 February 2005, by Info-ZIP:
|
|
|
|
*
|
|
|
|
* # /usr/bin/unzip -qq -v decompress_unlzma.i.zip
|
|
|
|
* 204372 Defl:N 35278 83% 09-06-09 14:23 0d056252 decompress_unlzma.i
|
|
|
|
* # /usr/bin/unzip -q -v decompress_unlzma.i.zip
|
|
|
|
* Length Method Size Ratio Date Time CRC-32 Name
|
|
|
|
* -------- ------ ------- ----- ---- ---- ------ ----
|
|
|
|
* 204372 Defl:N 35278 83% 09-06-09 14:23 0d056252 decompress_unlzma.i
|
|
|
|
* -------- ------- --- -------
|
|
|
|
* 204372 35278 83% 1 file
|
|
|
|
* # /usr/bin/unzip -v decompress_unlzma.i.zip
|
|
|
|
* Archive: decompress_unlzma.i.zip
|
|
|
|
* Length Method Size Ratio Date Time CRC-32 Name
|
|
|
|
* -------- ------ ------- ----- ---- ---- ------ ----
|
|
|
|
* 204372 Defl:N 35278 83% 09-06-09 14:23 0d056252 decompress_unlzma.i
|
|
|
|
* -------- ------- --- -------
|
|
|
|
* 204372 35278 83% 1 file
|
|
|
|
* # unzip -v decompress_unlzma.i.zip
|
|
|
|
* Archive: decompress_unlzma.i.zip
|
|
|
|
* Length Date Time Name
|
|
|
|
* -------- ---- ---- ----
|
|
|
|
* 204372 09-06-09 14:23 decompress_unlzma.i
|
|
|
|
* -------- -------
|
|
|
|
* 204372 1 files
|
|
|
|
* # /usr/bin/unzip -l -qq decompress_unlzma.i.zip
|
|
|
|
* 204372 09-06-09 14:23 decompress_unlzma.i
|
|
|
|
* # /usr/bin/unzip -l -q decompress_unlzma.i.zip
|
|
|
|
* Length Date Time Name
|
|
|
|
* -------- ---- ---- ----
|
|
|
|
* 204372 09-06-09 14:23 decompress_unlzma.i
|
|
|
|
* -------- -------
|
|
|
|
* 204372 1 file
|
|
|
|
* # /usr/bin/unzip -l decompress_unlzma.i.zip
|
|
|
|
* Archive: decompress_unlzma.i.zip
|
|
|
|
* Length Date Time Name
|
|
|
|
* -------- ---- ---- ----
|
|
|
|
* 204372 09-06-09 14:23 decompress_unlzma.i
|
|
|
|
* -------- -------
|
|
|
|
* 204372 1 file
|
|
|
|
*/
|
|
|
|
|
2017-07-20 23:34:49 +05:30
|
|
|
opts = 0;
|
2007-10-19 04:57:46 +05:30
|
|
|
/* '-' makes getopt return 1 for non-options */
|
2021-04-15 01:04:00 +05:30
|
|
|
while ((i = getopt(argc, argv, "-d:lnotpqxjv")) != -1) {
|
2017-07-20 23:34:49 +05:30
|
|
|
switch (i) {
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'd': /* Extract to base directory */
|
|
|
|
base_dir = optarg;
|
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'l': /* List */
|
2017-07-20 23:34:49 +05:30
|
|
|
opts |= OPT_l;
|
2012-06-15 20:13:26 +05:30
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'n': /* Never overwrite existing files */
|
|
|
|
overwrite = O_NEVER;
|
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'o': /* Always overwrite existing files */
|
|
|
|
overwrite = O_ALWAYS;
|
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2021-04-15 01:04:00 +05:30
|
|
|
case 't': /* Extract files to /dev/null */
|
|
|
|
xmove_fd(xopen("/dev/null", O_WRONLY), STDOUT_FILENO);
|
|
|
|
/*fallthrough*/
|
|
|
|
|
|
|
|
case 'p': /* Extract files to stdout */
|
2012-06-15 20:13:26 +05:30
|
|
|
dst_fd = STDOUT_FILENO;
|
2021-04-15 01:04:00 +05:30
|
|
|
/*fallthrough*/
|
2009-09-06 20:22:50 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'q': /* Be quiet */
|
|
|
|
quiet++;
|
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'v': /* Verbose list */
|
2017-01-05 16:13:53 +05:30
|
|
|
IF_FEATURE_UNZIP_CDF(verbose++;)
|
2017-07-20 23:34:49 +05:30
|
|
|
opts |= OPT_l;
|
2012-06-15 20:13:26 +05:30
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 'x':
|
2017-07-20 23:34:49 +05:30
|
|
|
opts |= OPT_x;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'j':
|
|
|
|
opts |= OPT_j;
|
2005-07-21 01:56:49 +05:30
|
|
|
break;
|
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
case 1:
|
|
|
|
if (!src_fn) {
|
|
|
|
/* The zip file */
|
|
|
|
/* +5: space for ".zip" and NUL */
|
|
|
|
src_fn = xmalloc(strlen(optarg) + 5);
|
|
|
|
strcpy(src_fn, optarg);
|
2017-07-20 23:34:49 +05:30
|
|
|
} else if (!(opts & OPT_x)) {
|
2012-06-15 20:13:26 +05:30
|
|
|
/* Include files */
|
2006-05-27 05:14:51 +05:30
|
|
|
llist_add_to(&zaccept, optarg);
|
2012-06-15 20:13:26 +05:30
|
|
|
} else {
|
|
|
|
/* Exclude files */
|
2006-05-27 05:14:51 +05:30
|
|
|
llist_add_to(&zreject, optarg);
|
2007-10-19 04:57:46 +05:30
|
|
|
}
|
2012-06-15 20:13:26 +05:30
|
|
|
break;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
|
|
|
default:
|
|
|
|
bb_show_usage();
|
2002-01-02 19:22:26 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
#ifndef __GLIBC__
|
|
|
|
/*
|
|
|
|
* This code is needed for non-GNU getopt
|
|
|
|
* which doesn't understand "-" in option string.
|
|
|
|
* The -x option won't work properly in this case:
|
|
|
|
* "unzip a.zip q -x w e" will be interpreted as
|
|
|
|
* "unzip a.zip q w e -x" = "unzip a.zip q w e"
|
|
|
|
*/
|
|
|
|
argv += optind;
|
|
|
|
if (argv[0]) {
|
|
|
|
/* +5: space for ".zip" and NUL */
|
|
|
|
src_fn = xmalloc(strlen(argv[0]) + 5);
|
|
|
|
strcpy(src_fn, argv[0]);
|
|
|
|
while (*++argv)
|
|
|
|
llist_add_to(&zaccept, *argv);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!src_fn) {
|
2003-03-19 14:43:01 +05:30
|
|
|
bb_show_usage();
|
2002-01-02 19:22:26 +05:30
|
|
|
}
|
|
|
|
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Open input file */
|
2006-12-17 05:19:13 +05:30
|
|
|
if (LONE_DASH(src_fn)) {
|
2008-09-21 06:31:46 +05:30
|
|
|
xdup2(STDIN_FILENO, zip_fd);
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Cannot use prompt mode since zip data is arriving on STDIN */
|
2007-10-19 04:57:46 +05:30
|
|
|
if (overwrite == O_PROMPT)
|
|
|
|
overwrite = O_NEVER;
|
2002-11-03 19:35:15 +05:30
|
|
|
} else {
|
2016-04-22 21:39:21 +05:30
|
|
|
static const char extn[][5] ALIGN1 = { ".zip", ".ZIP" };
|
2012-06-15 20:13:26 +05:30
|
|
|
char *ext = src_fn + strlen(src_fn);
|
|
|
|
int src_fd;
|
2007-10-19 04:57:46 +05:30
|
|
|
|
2012-06-15 20:13:26 +05:30
|
|
|
i = 0;
|
|
|
|
for (;;) {
|
2005-07-21 01:56:49 +05:30
|
|
|
src_fd = open(src_fn, O_RDONLY);
|
2012-06-15 20:13:26 +05:30
|
|
|
if (src_fd >= 0)
|
|
|
|
break;
|
|
|
|
if (++i > 2) {
|
|
|
|
*ext = '\0';
|
2018-09-30 20:26:56 +05:30
|
|
|
bb_error_msg_and_die("can't open %s[.zip]",
|
|
|
|
src_fn
|
|
|
|
);
|
2012-06-15 20:13:26 +05:30
|
|
|
}
|
|
|
|
strcpy(ext, extn[i - 1]);
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
2008-09-21 06:31:46 +05:30
|
|
|
xmove_fd(src_fd, zip_fd);
|
2002-11-03 19:35:15 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Change dir if necessary */
|
2020-04-15 17:31:44 +05:30
|
|
|
if (base_dir) {
|
|
|
|
/* -p DIR: try to create, errors don't matter.
|
|
|
|
* UnZip 6.00 does no multi-level mkdir (-p DIR1/DIR2 syntax),
|
|
|
|
* not using bb_make_directory() here (yet?)
|
|
|
|
*/
|
|
|
|
mkdir(base_dir, 0777);
|
2006-08-03 21:11:12 +05:30
|
|
|
xchdir(base_dir);
|
2020-04-15 17:31:44 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2009-09-06 20:22:50 +05:30
|
|
|
if (quiet <= 1) { /* not -qq */
|
2018-09-30 20:26:56 +05:30
|
|
|
if (quiet == 0) {
|
|
|
|
printf("Archive: %s\n",
|
|
|
|
printable_string(src_fn)
|
|
|
|
);
|
|
|
|
}
|
2017-07-20 23:34:49 +05:30
|
|
|
if (opts & OPT_l) {
|
2009-09-06 20:22:50 +05:30
|
|
|
puts(verbose ?
|
2016-04-18 05:13:24 +05:30
|
|
|
" Length Method Size Cmpr Date Time CRC-32 Name\n"
|
|
|
|
"-------- ------ ------- ---- ---------- ----- -------- ----"
|
2009-09-06 20:22:50 +05:30
|
|
|
:
|
2016-04-18 05:13:24 +05:30
|
|
|
" Length Date Time Name\n"
|
|
|
|
"--------- ---------- ----- ----"
|
2009-09-06 20:22:50 +05:30
|
|
|
);
|
2007-10-19 04:57:46 +05:30
|
|
|
}
|
|
|
|
}
|
2002-01-02 19:22:26 +05:30
|
|
|
|
2010-05-24 08:03:02 +05:30
|
|
|
/* Example of an archive with one 0-byte long file named 'z'
|
|
|
|
* created by Zip 2.31 on Unix:
|
|
|
|
* 0000 [50 4b]03 04 0a 00 00 00 00 00 42 1a b8 3c 00 00 |PK........B..<..|
|
|
|
|
* sig........ vneed flags compr mtime mdate crc32>
|
|
|
|
* 0010 00 00 00 00 00 00 00 00 00 00 01 00 15 00 7a 55 |..............zU|
|
|
|
|
* >..... csize...... usize...... fnlen exlen fn ex>
|
|
|
|
* 0020 54 09 00 03 cc d3 f9 4b cc d3 f9 4b 55 78 04 00 |T......K...KUx..|
|
|
|
|
* >tra_field......................................
|
|
|
|
* 0030 00 00 00 00[50 4b]01 02 17 03 0a 00 00 00 00 00 |....PK..........|
|
|
|
|
* ........... sig........ vmade vneed flags compr
|
|
|
|
* 0040 42 1a b8 3c 00 00 00 00 00 00 00 00 00 00 00 00 |B..<............|
|
|
|
|
* mtime mdate crc32...... csize...... usize......
|
|
|
|
* 0050 01 00 0d 00 00 00 00 00 00 00 00 00 a4 81 00 00 |................|
|
|
|
|
* fnlen exlen clen. dnum. iattr eattr...... relofs> (eattr = rw-r--r--)
|
|
|
|
* 0060 00 00 7a 55 54 05 00 03 cc d3 f9 4b 55 78 00 00 |..zUT......KUx..|
|
|
|
|
* >..... fn extra_field...........................
|
|
|
|
* 0070 [50 4b]05 06 00 00 00 00 01 00 01 00 3c 00 00 00 |PK..........<...|
|
|
|
|
* 0080 34 00 00 00 00 00 |4.....|
|
|
|
|
*/
|
2009-09-06 20:22:50 +05:30
|
|
|
total_usize = 0;
|
2007-10-19 04:57:46 +05:30
|
|
|
total_size = 0;
|
|
|
|
total_entries = 0;
|
2017-01-05 16:13:53 +05:30
|
|
|
cdf_offset = find_cdf_offset(); /* try to seek to the end, find CDE and CDF start */
|
2002-09-25 08:17:48 +05:30
|
|
|
while (1) {
|
2017-01-08 18:44:19 +05:30
|
|
|
zip_header_t zip;
|
2010-05-24 08:03:02 +05:30
|
|
|
mode_t dir_mode = 0777;
|
2017-01-05 16:13:53 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
2010-05-24 08:03:02 +05:30
|
|
|
mode_t file_mode = 0666;
|
|
|
|
#endif
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
if (!ENABLE_FEATURE_UNZIP_CDF || cdf_offset == BAD_CDF_OFFSET) {
|
|
|
|
/* Normally happens when input is unseekable.
|
|
|
|
*
|
|
|
|
* Valid ZIP file has Central Directory at the end
|
|
|
|
* with central directory file headers (CDFs).
|
|
|
|
* After it, there is a Central Directory End structure.
|
|
|
|
* CDFs identify what files are in the ZIP and where
|
|
|
|
* they are located. This allows ZIP readers to load
|
|
|
|
* the list of files without reading the entire ZIP archive.
|
|
|
|
* ZIP files may be appended to, only files specified in
|
|
|
|
* the CD are valid. Scanning for local file headers is
|
|
|
|
* not a correct algorithm.
|
|
|
|
*
|
|
|
|
* We try to do the above, and resort to "linear" reading
|
|
|
|
* of ZIP file only if seek failed or CDE wasn't found.
|
|
|
|
*/
|
|
|
|
uint32_t magic;
|
2010-05-24 08:03:02 +05:30
|
|
|
|
2017-01-05 16:13:53 +05:30
|
|
|
/* Check magic number */
|
|
|
|
xread(zip_fd, &magic, 4);
|
2017-01-08 18:44:19 +05:30
|
|
|
/* CDF item? Assume there are no more files, exit */
|
2017-01-05 16:13:53 +05:30
|
|
|
if (magic == ZIP_CDF_MAGIC) {
|
|
|
|
dbg("got ZIP_CDF_MAGIC");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Data descriptor? It was a streaming file, go on */
|
|
|
|
if (magic == ZIP_DD_MAGIC) {
|
|
|
|
dbg("got ZIP_DD_MAGIC");
|
|
|
|
/* skip over duplicate crc32, cmpsize and ucmpsize */
|
|
|
|
unzip_skip(3 * 4);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (magic != ZIP_FILEHEADER_MAGIC)
|
|
|
|
bb_error_msg_and_die("invalid zip magic %08X", (int)magic);
|
|
|
|
dbg("got ZIP_FILEHEADER_MAGIC");
|
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
xread(zip_fd, zip.raw, ZIP_HEADER_LEN);
|
|
|
|
FIX_ENDIANNESS_ZIP(zip);
|
2017-01-09 17:40:10 +05:30
|
|
|
if (zip.fmt.zip_flags & SWAP_LE16(0x0008)) {
|
|
|
|
bb_error_msg_and_die("zip flag %s is not supported",
|
|
|
|
"8 (streaming)");
|
2017-01-05 16:13:53 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
|
|
|
else {
|
|
|
|
/* cdf_offset is valid (and we know the file is seekable) */
|
2017-01-08 18:44:19 +05:30
|
|
|
cdf_header_t cdf;
|
|
|
|
cdf_offset = read_next_cdf(cdf_offset, &cdf);
|
2017-01-05 16:13:53 +05:30
|
|
|
if (cdf_offset == 0) /* EOF? */
|
|
|
|
break;
|
2017-01-08 18:44:19 +05:30
|
|
|
# if 1
|
2017-01-05 16:13:53 +05:30
|
|
|
xlseek(zip_fd,
|
2017-01-08 18:44:19 +05:30
|
|
|
SWAP_LE32(cdf.fmt.relative_offset_of_local_header) + 4,
|
2017-01-05 16:13:53 +05:30
|
|
|
SEEK_SET);
|
2017-01-08 18:44:19 +05:30
|
|
|
xread(zip_fd, zip.raw, ZIP_HEADER_LEN);
|
|
|
|
FIX_ENDIANNESS_ZIP(zip);
|
|
|
|
if (zip.fmt.zip_flags & SWAP_LE16(0x0008)) {
|
2010-05-24 08:03:02 +05:30
|
|
|
/* 0x0008 - streaming. [u]cmpsize can be reliably gotten
|
2017-01-05 16:13:53 +05:30
|
|
|
* only from Central Directory.
|
2013-07-21 06:01:08 +05:30
|
|
|
*/
|
2017-01-08 18:44:19 +05:30
|
|
|
zip.fmt.crc32 = cdf.fmt.crc32;
|
|
|
|
zip.fmt.cmpsize = cdf.fmt.cmpsize;
|
|
|
|
zip.fmt.ucmpsize = cdf.fmt.ucmpsize;
|
2010-05-24 08:03:02 +05:30
|
|
|
}
|
2017-07-12 01:40:52 +05:30
|
|
|
// Seen in some zipfiles: central directory 9 byte extra field contains
|
|
|
|
// a subfield with ID 0x5455 and 5 data bytes, which is a Unix-style UTC mtime.
|
|
|
|
// Local header version:
|
|
|
|
// u16 0x5455 ("UT")
|
|
|
|
// u16 size (1 + 4 * n)
|
|
|
|
// u8 flags: bit 0:mtime is present, bit 1:atime is present, bit 2:ctime is present
|
|
|
|
// u32 mtime
|
|
|
|
// u32 atime
|
|
|
|
// u32 ctime
|
|
|
|
// Central header version:
|
|
|
|
// u16 0x5455 ("UT")
|
|
|
|
// u16 size (5 (or 1?))
|
|
|
|
// u8 flags: bit 0:mtime is present, bit 1:atime is present, bit 2:ctime is present
|
|
|
|
// u32 mtime (CDF does not store atime/ctime)
|
2017-01-05 16:13:53 +05:30
|
|
|
# else
|
2017-01-08 18:44:19 +05:30
|
|
|
/* CDF has the same data as local header, no need to read the latter...
|
|
|
|
* ...not really. An archive was seen with cdf.extra_len == 6 but
|
|
|
|
* zip.extra_len == 0.
|
|
|
|
*/
|
|
|
|
memcpy(&zip.fmt.version,
|
|
|
|
&cdf.fmt.version_needed, ZIP_HEADER_LEN);
|
2017-01-05 16:13:53 +05:30
|
|
|
xlseek(zip_fd,
|
2017-01-08 18:44:19 +05:30
|
|
|
SWAP_LE32(cdf.fmt.relative_offset_of_local_header) + 4 + ZIP_HEADER_LEN,
|
2017-01-05 16:13:53 +05:30
|
|
|
SEEK_SET);
|
|
|
|
# endif
|
2017-01-08 18:44:19 +05:30
|
|
|
if ((cdf.fmt.version_made_by >> 8) == 3) {
|
2013-07-21 06:01:08 +05:30
|
|
|
/* This archive is created on Unix */
|
2017-01-08 18:44:19 +05:30
|
|
|
dir_mode = file_mode = (cdf.fmt.external_attributes >> 16);
|
2010-05-24 08:03:02 +05:30
|
|
|
}
|
2008-07-26 23:02:41 +05:30
|
|
|
}
|
2008-09-21 06:31:46 +05:30
|
|
|
#endif
|
2017-01-05 16:13:53 +05:30
|
|
|
|
2017-01-08 18:44:19 +05:30
|
|
|
if (zip.fmt.zip_flags & SWAP_LE16(0x0001)) {
|
2017-01-05 16:13:53 +05:30
|
|
|
/* 0x0001 - encrypted */
|
2017-01-09 17:40:10 +05:30
|
|
|
bb_error_msg_and_die("zip flag %s is not supported",
|
|
|
|
"1 (encryption)");
|
2017-01-05 16:13:53 +05:30
|
|
|
}
|
2016-04-18 04:44:05 +05:30
|
|
|
dbg("File cmpsize:0x%x extra_len:0x%x ucmpsize:0x%x",
|
2017-01-08 18:44:19 +05:30
|
|
|
(unsigned)zip.fmt.cmpsize,
|
|
|
|
(unsigned)zip.fmt.extra_len,
|
|
|
|
(unsigned)zip.fmt.ucmpsize
|
2016-04-18 04:44:05 +05:30
|
|
|
);
|
2002-09-25 08:17:48 +05:30
|
|
|
|
|
|
|
/* Read filename */
|
2005-07-21 01:56:49 +05:30
|
|
|
free(dst_fn);
|
2017-07-20 23:51:50 +05:30
|
|
|
die_if_bad_fnamesize(zip.fmt.filename_len);
|
2017-01-08 18:44:19 +05:30
|
|
|
dst_fn = xzalloc(zip.fmt.filename_len + 1);
|
|
|
|
xread(zip_fd, dst_fn, zip.fmt.filename_len);
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Skip extra header bytes */
|
2017-01-08 18:44:19 +05:30
|
|
|
unzip_skip(zip.fmt.extra_len);
|
2005-07-21 01:56:49 +05:30
|
|
|
|
2015-02-10 06:00:43 +05:30
|
|
|
/* Guard against "/abspath", "/../" and similar attacks */
|
|
|
|
overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
|
|
|
|
|
2005-07-21 01:56:49 +05:30
|
|
|
/* Filter zip entries */
|
2007-10-19 04:57:46 +05:30
|
|
|
if (find_list_entry(zreject, dst_fn)
|
|
|
|
|| (zaccept && !find_list_entry(zaccept, dst_fn))
|
|
|
|
) { /* Skip entry */
|
2017-01-09 17:40:10 +05:30
|
|
|
goto skip_cmpsize;
|
|
|
|
}
|
|
|
|
|
2017-07-20 23:34:49 +05:30
|
|
|
if (opts & OPT_l) {
|
2017-01-09 17:40:10 +05:30
|
|
|
/* List entry */
|
|
|
|
char dtbuf[sizeof("mm-dd-yyyy hh:mm")];
|
|
|
|
sprintf(dtbuf, "%02u-%02u-%04u %02u:%02u",
|
|
|
|
(zip.fmt.moddate >> 5) & 0xf, // mm: 0x01e0
|
|
|
|
(zip.fmt.moddate) & 0x1f, // dd: 0x001f
|
|
|
|
(zip.fmt.moddate >> 9) + 1980, // yy: 0xfe00
|
|
|
|
(zip.fmt.modtime >> 11), // hh: 0xf800
|
|
|
|
(zip.fmt.modtime >> 5) & 0x3f // mm: 0x07e0
|
|
|
|
// seconds/2 not shown, encoded in -- 0x001f
|
|
|
|
);
|
|
|
|
if (!verbose) {
|
|
|
|
// " Length Date Time Name\n"
|
|
|
|
// "--------- ---------- ----- ----"
|
|
|
|
printf( "%9u " "%s " "%s\n",
|
|
|
|
(unsigned)zip.fmt.ucmpsize,
|
|
|
|
dtbuf,
|
2018-09-30 20:26:56 +05:30
|
|
|
printable_string(dst_fn)
|
|
|
|
);
|
2017-01-09 17:40:10 +05:30
|
|
|
} else {
|
|
|
|
char method6[7];
|
|
|
|
unsigned long percents;
|
|
|
|
|
|
|
|
sprintf(method6, "%6u", zip.fmt.method);
|
|
|
|
if (zip.fmt.method == 0) {
|
|
|
|
strcpy(method6, "Stored");
|
2007-10-01 17:35:12 +05:30
|
|
|
}
|
2017-01-09 17:40:10 +05:30
|
|
|
if (zip.fmt.method == 8) {
|
|
|
|
strcpy(method6, "Defl:N");
|
|
|
|
/* normal, maximum, fast, superfast */
|
|
|
|
IF_DESKTOP(method6[5] = "NXFS"[(zip.fmt.zip_flags >> 1) & 3];)
|
|
|
|
}
|
|
|
|
percents = zip.fmt.ucmpsize - zip.fmt.cmpsize;
|
|
|
|
if ((int32_t)percents < 0)
|
|
|
|
percents = 0; /* happens if ucmpsize < cmpsize */
|
|
|
|
percents = percents * 100;
|
|
|
|
if (zip.fmt.ucmpsize)
|
|
|
|
percents /= zip.fmt.ucmpsize;
|
|
|
|
// " Length Method Size Cmpr Date Time CRC-32 Name\n"
|
|
|
|
// "-------- ------ ------- ---- ---------- ----- -------- ----"
|
|
|
|
printf( "%8u %s" "%9u%4u%% " "%s " "%08x " "%s\n",
|
|
|
|
(unsigned)zip.fmt.ucmpsize,
|
|
|
|
method6,
|
|
|
|
(unsigned)zip.fmt.cmpsize,
|
|
|
|
(unsigned)percents,
|
|
|
|
dtbuf,
|
|
|
|
zip.fmt.crc32,
|
2018-09-30 20:26:56 +05:30
|
|
|
printable_string(dst_fn)
|
|
|
|
);
|
2017-01-09 17:40:10 +05:30
|
|
|
total_size += zip.fmt.cmpsize;
|
|
|
|
}
|
|
|
|
total_usize += zip.fmt.ucmpsize;
|
|
|
|
goto skip_cmpsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dst_fd == STDOUT_FILENO) {
|
|
|
|
/* Extracting to STDOUT */
|
|
|
|
goto do_extract;
|
|
|
|
}
|
2017-11-07 12:33:36 +05:30
|
|
|
|
|
|
|
/* Strip paths (after -l: unzip -lj a.zip lists full names) */
|
|
|
|
if (opts & OPT_j)
|
|
|
|
overlapping_strcpy(dst_fn, bb_basename(dst_fn));
|
|
|
|
/* Did this strip everything ("DIR/" case)? Then skip */
|
|
|
|
if (!dst_fn[0])
|
|
|
|
goto skip_cmpsize;
|
|
|
|
|
2017-01-09 17:40:10 +05:30
|
|
|
if (last_char_is(dst_fn, '/')) {
|
2017-07-20 22:26:05 +05:30
|
|
|
int mode;
|
|
|
|
|
2017-01-09 17:40:10 +05:30
|
|
|
/* Extract directory */
|
2017-07-20 22:26:05 +05:30
|
|
|
mode = get_lstat_mode(dst_fn);
|
|
|
|
if (mode == -1) { /* ENOENT */
|
2017-01-09 17:40:10 +05:30
|
|
|
if (!quiet) {
|
2018-09-30 20:26:56 +05:30
|
|
|
printf(" creating: %s\n", printable_string(dst_fn));
|
2017-01-09 17:40:10 +05:30
|
|
|
}
|
|
|
|
unzip_create_leading_dirs(dst_fn);
|
|
|
|
if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) {
|
|
|
|
xfunc_die();
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
2015-02-10 06:00:43 +05:30
|
|
|
} else {
|
2017-07-20 22:26:05 +05:30
|
|
|
if (!S_ISDIR(mode)) {
|
2017-01-09 17:40:10 +05:30
|
|
|
bb_error_msg_and_die("'%s' exists but is not a %s",
|
2018-09-30 20:26:56 +05:30
|
|
|
printable_string(dst_fn),
|
|
|
|
"directory"
|
|
|
|
);
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
2017-01-09 17:40:10 +05:30
|
|
|
goto skip_cmpsize;
|
|
|
|
}
|
|
|
|
check_file:
|
2017-07-20 22:26:05 +05:30
|
|
|
/* Does target file already exist? */
|
|
|
|
{
|
|
|
|
int mode = get_lstat_mode(dst_fn);
|
|
|
|
if (mode == -1) {
|
|
|
|
/* ENOENT: does not exist */
|
|
|
|
goto do_open_and_extract;
|
2017-01-09 17:40:10 +05:30
|
|
|
}
|
2017-07-20 22:26:05 +05:30
|
|
|
if (overwrite == O_NEVER) {
|
|
|
|
goto skip_cmpsize;
|
|
|
|
}
|
|
|
|
if (!S_ISREG(mode)) {
|
|
|
|
fishy:
|
|
|
|
bb_error_msg_and_die("'%s' exists but is not a %s",
|
2018-09-30 20:26:56 +05:30
|
|
|
printable_string(dst_fn),
|
|
|
|
"regular file"
|
|
|
|
);
|
2017-07-20 22:26:05 +05:30
|
|
|
}
|
|
|
|
if (overwrite == O_ALWAYS) {
|
|
|
|
goto do_open_and_extract;
|
|
|
|
}
|
2018-09-30 20:26:56 +05:30
|
|
|
printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ",
|
|
|
|
printable_string(dst_fn)
|
|
|
|
);
|
2017-07-20 22:26:05 +05:30
|
|
|
my_fgets80(key_buf);
|
|
|
|
/* User input could take a long time. Is it still a regular file? */
|
|
|
|
mode = get_lstat_mode(dst_fn);
|
|
|
|
if (!S_ISREG(mode))
|
|
|
|
goto fishy;
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2017-07-20 22:26:05 +05:30
|
|
|
/* Extract (or skip) it */
|
2017-01-09 17:40:10 +05:30
|
|
|
switch (key_buf[0]) {
|
2005-07-21 01:56:49 +05:30
|
|
|
case 'A':
|
2007-10-19 04:57:46 +05:30
|
|
|
overwrite = O_ALWAYS;
|
2005-07-21 01:56:49 +05:30
|
|
|
case 'y': /* Open file and fall into unzip */
|
2017-01-09 17:40:10 +05:30
|
|
|
do_open_and_extract:
|
2005-07-21 01:56:49 +05:30
|
|
|
unzip_create_leading_dirs(dst_fn);
|
2017-01-05 16:13:53 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
2017-07-20 22:26:05 +05:30
|
|
|
dst_fd = -1;
|
|
|
|
if (!S_ISLNK(file_mode)) {
|
|
|
|
dst_fd = xopen3(dst_fn,
|
|
|
|
O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW,
|
|
|
|
file_mode);
|
|
|
|
}
|
2010-05-24 08:03:02 +05:30
|
|
|
#else
|
2017-07-20 22:26:05 +05:30
|
|
|
/* O_NOFOLLOW defends against symlink attacks */
|
|
|
|
dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW);
|
2010-05-24 08:03:02 +05:30
|
|
|
#endif
|
2009-09-06 20:22:50 +05:30
|
|
|
if (!quiet) {
|
2017-01-08 18:44:19 +05:30
|
|
|
printf(/* zip.fmt.method == 0
|
|
|
|
? " extracting: %s\n"
|
2018-09-30 20:26:56 +05:30
|
|
|
: */ " inflating: %s\n",
|
|
|
|
printable_string(dst_fn)
|
|
|
|
);
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
2021-04-15 01:04:00 +05:30
|
|
|
do_extract:
|
2017-07-20 22:04:51 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
|
|
|
if (S_ISLNK(file_mode)) {
|
2017-07-20 22:26:05 +05:30
|
|
|
if (dst_fd != STDOUT_FILENO) /* not -p? */
|
2018-02-20 20:27:45 +05:30
|
|
|
unzip_extract_symlink(&symlink_placeholders, &zip, dst_fn);
|
2017-07-20 22:04:51 +05:30
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
unzip_extract(&zip, dst_fd);
|
|
|
|
if (dst_fd != STDOUT_FILENO) {
|
|
|
|
/* closing STDOUT is potentially bad for future business */
|
|
|
|
close(dst_fd);
|
|
|
|
}
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
|
|
|
break;
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2005-07-21 01:56:49 +05:30
|
|
|
case 'N':
|
2007-10-19 04:57:46 +05:30
|
|
|
overwrite = O_NEVER;
|
2017-01-09 17:40:10 +05:30
|
|
|
case 'n': /* Skip entry data */
|
|
|
|
skip_cmpsize:
|
2017-01-08 18:44:19 +05:30
|
|
|
unzip_skip(zip.fmt.cmpsize);
|
2005-07-21 01:56:49 +05:30
|
|
|
break;
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2005-07-21 01:56:49 +05:30
|
|
|
case 'r':
|
|
|
|
/* Prompt for new name */
|
|
|
|
printf("new name: ");
|
2013-01-22 15:46:08 +05:30
|
|
|
my_fgets80(key_buf);
|
2005-07-21 01:56:49 +05:30
|
|
|
free(dst_fn);
|
2006-08-03 21:11:12 +05:30
|
|
|
dst_fn = xstrdup(key_buf);
|
2005-07-21 01:56:49 +05:30
|
|
|
chomp(dst_fn);
|
2008-07-26 23:02:41 +05:30
|
|
|
goto check_file;
|
2005-07-21 01:56:49 +05:30
|
|
|
|
|
|
|
default:
|
2017-01-09 17:40:10 +05:30
|
|
|
printf("error: invalid response [%c]\n", (char)key_buf[0]);
|
2008-07-26 23:02:41 +05:30
|
|
|
goto check_file;
|
2005-07-21 01:56:49 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2008-09-21 06:31:46 +05:30
|
|
|
total_entries++;
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
|
|
|
|
2018-02-20 20:27:45 +05:30
|
|
|
#if ENABLE_FEATURE_UNZIP_CDF
|
2018-05-22 21:04:31 +05:30
|
|
|
create_links_from_list(symlink_placeholders);
|
2018-02-20 20:27:45 +05:30
|
|
|
#endif
|
|
|
|
|
2017-07-20 23:34:49 +05:30
|
|
|
if ((opts & OPT_l) && quiet <= 1) {
|
2009-09-06 20:22:50 +05:30
|
|
|
if (!verbose) {
|
2016-04-18 05:13:24 +05:30
|
|
|
// " Length Date Time Name\n"
|
|
|
|
// "--------- ---------- ----- ----"
|
|
|
|
printf( " --------%21s" "-------\n"
|
|
|
|
"%9lu%21s" "%u files\n",
|
|
|
|
"",
|
|
|
|
total_usize, "", total_entries);
|
2009-09-06 20:22:50 +05:30
|
|
|
} else {
|
|
|
|
unsigned long percents = total_usize - total_size;
|
2016-04-18 05:13:24 +05:30
|
|
|
if ((long)percents < 0)
|
|
|
|
percents = 0; /* happens if usize < size */
|
2009-09-06 20:22:50 +05:30
|
|
|
percents = percents * 100;
|
|
|
|
if (total_usize)
|
|
|
|
percents /= total_usize;
|
2016-04-18 05:13:24 +05:30
|
|
|
// " Length Method Size Cmpr Date Time CRC-32 Name\n"
|
|
|
|
// "-------- ------ ------- ---- ---------- ----- -------- ----"
|
|
|
|
printf( "-------- ------- ----%28s" "----\n"
|
|
|
|
"%8lu" "%17lu%4u%%%28s" "%u files\n",
|
|
|
|
"",
|
|
|
|
total_usize, total_size, (unsigned)percents, "",
|
2009-09-06 20:22:50 +05:30
|
|
|
total_entries);
|
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
}
|
|
|
|
|
2007-10-19 04:57:46 +05:30
|
|
|
return 0;
|
2002-01-02 19:22:26 +05:30
|
|
|
}
|