39a04f71ca
function old new delta append_ext - 16 +16 unxz_main 77 83 +6 unlzma_main 77 83 +6 uncompress_main 42 48 +6 gzip_main 184 190 +6 bzip2_main 114 120 +6 bunzip2_main 61 67 +6 bbunpack 469 475 +6 send_tree 355 360 +5 lzop_main 89 92 +3 gunzip_main 61 64 +3 make_new_name_lzop 84 82 -2 make_new_name_gunzip 114 112 -2 make_new_name_unxz 14 - -14 make_new_name_unlzma 14 - -14 make_new_name_uncompress 14 - -14 make_new_name_bunzip2 14 - -14 make_new_name_gzip 17 - -17 make_new_name_bzip2 17 - -17 ------------------------------------------------------------------------------ (add/remove: 1/6 grow/shrink: 10/2 up/down: 69/-94) Total: -25 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
382 lines
10 KiB
C
382 lines
10 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Common code for gunzip-like applets
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
#include "libbb.h"
|
|
#include "unarchive.h"
|
|
|
|
enum {
|
|
OPT_STDOUT = 1 << 0,
|
|
OPT_FORCE = 1 << 1,
|
|
/* only some decompressors: */
|
|
OPT_VERBOSE = 1 << 2,
|
|
OPT_DECOMPRESS = 1 << 3,
|
|
OPT_TEST = 1 << 4,
|
|
};
|
|
|
|
static
|
|
int open_to_or_warn(int to_fd, const char *filename, int flags, int mode)
|
|
{
|
|
int fd = open3_or_warn(filename, flags, mode);
|
|
if (fd < 0) {
|
|
return 1;
|
|
}
|
|
xmove_fd(fd, to_fd);
|
|
return 0;
|
|
}
|
|
|
|
char* FAST_FUNC append_ext(char *filename, const char *expected_ext)
|
|
{
|
|
return xasprintf("%s.%s", filename, expected_ext);
|
|
}
|
|
|
|
int FAST_FUNC bbunpack(char **argv,
|
|
IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(unpack_info_t *info),
|
|
char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
|
|
const char *expected_ext
|
|
)
|
|
{
|
|
struct stat stat_buf;
|
|
IF_DESKTOP(long long) int status;
|
|
char *filename, *new_name;
|
|
smallint exitcode = 0;
|
|
unpack_info_t info;
|
|
|
|
do {
|
|
/* NB: new_name is *maybe* malloc'ed! */
|
|
new_name = NULL;
|
|
filename = *argv; /* can be NULL - 'streaming' bunzip2 */
|
|
|
|
if (filename && LONE_DASH(filename))
|
|
filename = NULL;
|
|
|
|
/* Open src */
|
|
if (filename) {
|
|
if (stat(filename, &stat_buf) != 0) {
|
|
bb_simple_perror_msg(filename);
|
|
err:
|
|
exitcode = 1;
|
|
goto free_name;
|
|
}
|
|
if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0))
|
|
goto err;
|
|
}
|
|
|
|
/* Special cases: test, stdout */
|
|
if (option_mask32 & (OPT_STDOUT|OPT_TEST)) {
|
|
if (option_mask32 & OPT_TEST)
|
|
if (open_to_or_warn(STDOUT_FILENO, bb_dev_null, O_WRONLY, 0))
|
|
goto err;
|
|
filename = NULL;
|
|
}
|
|
|
|
/* Open dst if we are going to unpack to file */
|
|
if (filename) {
|
|
new_name = make_new_name(filename, expected_ext);
|
|
if (!new_name) {
|
|
bb_error_msg("%s: unknown suffix - ignored", filename);
|
|
goto err;
|
|
}
|
|
|
|
/* -f: overwrite existing output files */
|
|
if (option_mask32 & OPT_FORCE) {
|
|
unlink(new_name);
|
|
}
|
|
|
|
/* O_EXCL: "real" bunzip2 doesn't overwrite files */
|
|
/* GNU gunzip does not bail out, but goes to next file */
|
|
if (open_to_or_warn(STDOUT_FILENO, new_name, O_WRONLY | O_CREAT | O_EXCL,
|
|
stat_buf.st_mode))
|
|
goto err;
|
|
}
|
|
|
|
/* Check that the input is sane */
|
|
if (isatty(STDIN_FILENO) && (option_mask32 & OPT_FORCE) == 0) {
|
|
bb_error_msg_and_die("compressed data not read from terminal, "
|
|
"use -f to force it");
|
|
}
|
|
|
|
/* memset(&info, 0, sizeof(info)); */
|
|
info.mtime = 0; /* so far it has one member only */
|
|
status = unpacker(&info);
|
|
if (status < 0)
|
|
exitcode = 1;
|
|
xclose(STDOUT_FILENO); /* with error check! */
|
|
|
|
if (filename) {
|
|
char *del = new_name;
|
|
if (status >= 0) {
|
|
/* TODO: restore other things? */
|
|
if (info.mtime) {
|
|
struct timeval times[2];
|
|
|
|
times[1].tv_sec = times[0].tv_sec = info.mtime;
|
|
times[1].tv_usec = times[0].tv_usec = 0;
|
|
/* Note: we closed it first.
|
|
* On some systems calling utimes
|
|
* then closing resets the mtime
|
|
* back to current time. */
|
|
utimes(new_name, times); /* ignoring errors */
|
|
}
|
|
|
|
/* Delete _compressed_ file */
|
|
del = filename;
|
|
/* restore extension (unless tgz -> tar case) */
|
|
if (new_name == filename)
|
|
filename[strlen(filename)] = '.';
|
|
}
|
|
xunlink(del);
|
|
|
|
#if 0 /* Currently buggy - wrong name: "a.gz: 261% - replaced with a.gz" */
|
|
/* Extreme bloat for gunzip compat */
|
|
if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE) && status >= 0) {
|
|
fprintf(stderr, "%s: %u%% - replaced with %s\n",
|
|
filename, (unsigned)(stat_buf.st_size*100 / (status+1)), new_name);
|
|
}
|
|
#endif
|
|
|
|
free_name:
|
|
if (new_name != filename)
|
|
free(new_name);
|
|
}
|
|
} while (*argv && *++argv);
|
|
|
|
return exitcode;
|
|
}
|
|
|
|
#if ENABLE_UNCOMPRESS || ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNXZ
|
|
static
|
|
char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
|
|
{
|
|
char *extension = strrchr(filename, '.');
|
|
if (!extension || strcmp(extension + 1, expected_ext) != 0) {
|
|
/* Mimic GNU gunzip - "real" bunzip2 tries to */
|
|
/* unpack file anyway, to file.out */
|
|
return NULL;
|
|
}
|
|
*extension = '\0';
|
|
return filename;
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Uncompress applet for busybox (c) 2002 Glenn McGrath
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
#if ENABLE_UNCOMPRESS
|
|
static
|
|
IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(unpack_info_t *info UNUSED_PARAM)
|
|
{
|
|
IF_DESKTOP(long long) int status = -1;
|
|
|
|
if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) {
|
|
bb_error_msg("invalid magic");
|
|
} else {
|
|
status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO);
|
|
}
|
|
return status;
|
|
}
|
|
int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int uncompress_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
getopt32(argv, "cf");
|
|
argv += optind;
|
|
|
|
return bbunpack(argv, unpack_uncompress, make_new_name_generic, "Z");
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Gzip implementation for busybox
|
|
*
|
|
* Based on GNU gzip v1.2.4 Copyright (C) 1992-1993 Jean-loup Gailly.
|
|
*
|
|
* Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de>
|
|
* based on gzip sources
|
|
*
|
|
* Adjusted further by Erik Andersen <andersen@codepoet.org> to support files as
|
|
* well as stdin/stdout, and to generally behave itself wrt command line
|
|
* handling.
|
|
*
|
|
* General cleanup to better adhere to the style guide and make use of standard
|
|
* busybox functions by Glenn McGrath
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*
|
|
* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
|
|
* Copyright (C) 1992-1993 Jean-loup Gailly
|
|
* The unzip code was written and put in the public domain by Mark Adler.
|
|
* Portions of the lzw code are derived from the public domain 'compress'
|
|
* written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies,
|
|
* Ken Turkowski, Dave Mack and Peter Jannesen.
|
|
*
|
|
* See the license_msg below and the file COPYING for the software license.
|
|
* See the file algorithm.doc for the compression algorithms and file formats.
|
|
*/
|
|
#if ENABLE_GUNZIP
|
|
static
|
|
char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM)
|
|
{
|
|
char *extension = strrchr(filename, '.');
|
|
|
|
if (!extension)
|
|
return NULL;
|
|
|
|
extension++;
|
|
if (strcmp(extension, "tgz" + 1) == 0
|
|
#if ENABLE_FEATURE_SEAMLESS_Z
|
|
|| (extension[0] == 'Z' && extension[1] == '\0')
|
|
#endif
|
|
) {
|
|
extension[-1] = '\0';
|
|
} else if (strcmp(extension, "tgz") == 0) {
|
|
filename = xstrdup(filename);
|
|
extension = strrchr(filename, '.');
|
|
extension[2] = 'a';
|
|
extension[3] = 'r';
|
|
} else {
|
|
return NULL;
|
|
}
|
|
return filename;
|
|
}
|
|
static
|
|
IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(unpack_info_t *info)
|
|
{
|
|
IF_DESKTOP(long long) int status = -1;
|
|
|
|
/* do the decompression, and cleanup */
|
|
if (xread_char(STDIN_FILENO) == 0x1f) {
|
|
unsigned char magic2;
|
|
|
|
magic2 = xread_char(STDIN_FILENO);
|
|
if (ENABLE_FEATURE_SEAMLESS_Z && magic2 == 0x9d) {
|
|
status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO);
|
|
} else if (magic2 == 0x8b) {
|
|
status = unpack_gz_stream_with_info(STDIN_FILENO, STDOUT_FILENO, info);
|
|
} else {
|
|
goto bad_magic;
|
|
}
|
|
if (status < 0) {
|
|
bb_error_msg("error inflating");
|
|
}
|
|
} else {
|
|
bad_magic:
|
|
bb_error_msg("invalid magic");
|
|
/* status is still == -1 */
|
|
}
|
|
return status;
|
|
}
|
|
/*
|
|
* Linux kernel build uses gzip -d -n. We accept and ignore it.
|
|
* Man page says:
|
|
* -n --no-name
|
|
* gzip: do not save the original file name and time stamp.
|
|
* (The original name is always saved if the name had to be truncated.)
|
|
* gunzip: do not restore the original file name/time even if present
|
|
* (remove only the gzip suffix from the compressed file name).
|
|
* This option is the default when decompressing.
|
|
* -N --name
|
|
* gzip: always save the original file name and time stamp (this is the default)
|
|
* gunzip: restore the original file name and time stamp if present.
|
|
*/
|
|
int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int gunzip_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
getopt32(argv, "cfvdtn");
|
|
argv += optind;
|
|
/* if called as zcat */
|
|
if (applet_name[1] == 'c')
|
|
option_mask32 |= OPT_STDOUT;
|
|
|
|
return bbunpack(argv, unpack_gunzip, make_new_name_gunzip, /*unused:*/ NULL);
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Modified for busybox by Glenn McGrath
|
|
* Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
#if ENABLE_BUNZIP2
|
|
static
|
|
IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(unpack_info_t *info UNUSED_PARAM)
|
|
{
|
|
return unpack_bz2_stream_prime(STDIN_FILENO, STDOUT_FILENO);
|
|
}
|
|
int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int bunzip2_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
getopt32(argv, "cfvdt");
|
|
argv += optind;
|
|
if (applet_name[2] == 'c') /* bzcat */
|
|
option_mask32 |= OPT_STDOUT;
|
|
|
|
return bbunpack(argv, unpack_bunzip2, make_new_name_generic, "bz2");
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Small lzma deflate implementation.
|
|
* Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org>
|
|
*
|
|
* Based on bunzip.c from busybox
|
|
*
|
|
* Licensed under GPL v2, see file LICENSE in this tarball for details.
|
|
*/
|
|
#if ENABLE_UNLZMA
|
|
static
|
|
IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(unpack_info_t *info UNUSED_PARAM)
|
|
{
|
|
return unpack_lzma_stream(STDIN_FILENO, STDOUT_FILENO);
|
|
}
|
|
int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int unlzma_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
IF_LZMA(int opts =) getopt32(argv, "cfvdt");
|
|
# if ENABLE_LZMA
|
|
/* lzma without -d or -t? */
|
|
if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
|
|
bb_show_usage();
|
|
# endif
|
|
/* lzcat? */
|
|
if (applet_name[2] == 'c')
|
|
option_mask32 |= OPT_STDOUT;
|
|
|
|
argv += optind;
|
|
return bbunpack(argv, unpack_unlzma, make_new_name_generic, "lzma");
|
|
}
|
|
#endif
|
|
|
|
|
|
#if ENABLE_UNXZ
|
|
static
|
|
IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(unpack_info_t *info UNUSED_PARAM)
|
|
{
|
|
return unpack_xz_stream(STDIN_FILENO, STDOUT_FILENO);
|
|
}
|
|
int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int unxz_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int opts = getopt32(argv, "cfvdt");
|
|
# if ENABLE_XZ
|
|
/* xz without -d or -t? */
|
|
if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
|
|
bb_show_usage();
|
|
# endif
|
|
/* xzcat? */
|
|
if (applet_name[2] == 'c')
|
|
option_mask32 |= OPT_STDOUT;
|
|
|
|
argv += optind;
|
|
return bbunpack(argv, unpack_unxz, make_new_name_generic, "xz");
|
|
}
|
|
#endif
|