diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-08 01:02:23 +0300 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-08 01:02:23 +0300 |
commit | ab9eef21a57c23567505e8fbceb8e5ea76306ce1 (patch) | |
tree | 800845b64d0e9a204743656c4d267cc6c9917cde /archival/bbunzip.c | |
parent | 8e858e2700651a0e973169b579622cd3dcd0defd (diff) |
bunzip2/gunzip/uncompress/unlzma: merge into common code -
fix few corner cases, reduce size by 450 bytes. Update testsuite.
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r-- | archival/bbunzip.c | 346 |
1 files changed, 346 insertions, 0 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c new file mode 100644 index 000000000..7ec8f4f0a --- /dev/null +++ b/archival/bbunzip.c @@ -0,0 +1,346 @@ +/* vi: set sw=4 ts=4: */ +/* + * Modified for busybox by Glenn McGrath <bug1@iinet.net.au> + * Added support output to stdout by Thomas Lundquist <thomasez@zelow.no> + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ + +#include "busybox.h" +#include "unarchive.h" + +enum { + OPT_STDOUT = 1, + OPT_FORCE = 2, +/* gunzip only: */ + OPT_TEST = 4, + OPT_DECOMPRESS = 8, + OPT_VERBOSE = 0x10, +}; + +static +int open_to_or_warn(int to_fd, const char *filename, int flags, int mode) +{ + int fd = open(filename, flags, mode); + if (fd < 0) { + bb_perror_msg("%s", filename); + return 1; + } + if (fd != to_fd) { + if (dup2(fd, to_fd) < 0) + bb_perror_msg_and_die("cannot dup"); + close(fd); + } + return 0; +} + +static +int unpack(char **argv, + char* (*make_new_name)(char *filename), + USE_DESKTOP(long long) int (*unpacker)(void) +) +{ + struct stat stat_buf; + USE_DESKTOP(long long) int status; + char *filename; + /* NB: new_name is *possibly* malloc'ed! */ + smallint exitcode = 0; + + do { + char *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_perror_msg("%s", 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 unless -c, "-" or called as bzcat */ + if (filename) { + new_name = make_new_name(filename); + if (!new_name) { + bb_error_msg("%s: unknown suffix - ignored", filename); + goto err; + } + /* O_EXCL: "real" bunzip2 doesn't overwrite files too */ + /* TODO: "real" gunzip goes 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"); + } + + status = unpacker(); + if (status < 0) + exitcode = 1; + + if (filename) { + char *del = new_name; + if (status >= 0) { + /* TODO: restore user/group/times here? */ + /* delete _old_ file */ + del = filename; + /* Restore extension (unless tgz -> tar case) */ + if (new_name == filename) + filename[strlen(filename)] = '.'; + } + if (unlink(del) < 0) + bb_perror_msg_and_die("cannot remove %s", 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_BUNZIP2 + +static +char* make_new_name_bunzip2(char *filename) +{ + char *extension = strrchr(filename, '.'); + if (!extension || strcmp(extension, ".bz2") != 0) { + /* Mimic GNU gunzip ("real" bunzip2 tries to */ + /* unpack file anyway, to file.out) */ + return NULL; + } + *extension = '\0'; + return filename; +} + +static +USE_DESKTOP(long long) int unpack_bunzip2(void) +{ + return uncompressStream(STDIN_FILENO, STDOUT_FILENO); +} + +int bunzip2_main(int argc, char **argv); +int bunzip2_main(int argc, char **argv) +{ + getopt32(argc, argv, "cf"); + argv += optind; + if (applet_name[2] == 'c') + option_mask32 |= OPT_STDOUT; + + return unpack(argv, make_new_name_bunzip2, unpack_bunzip2); +} + +#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 <bug1@iinet.net.au> + * + * 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* make_new_name_gunzip(char *filename) +{ + char *extension = strrchr(filename, '.'); + + if (!extension) + return NULL; + + if (strcmp(extension, ".gz") == 0 +#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS + || strcmp(extension, ".Z") == 0 +#endif + ) { + *extension = '\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 +USE_DESKTOP(long long) int unpack_gunzip(void) +{ + USE_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_GUNZIP_UNCOMPRESS && magic2 == 0x9d) { + status = uncompress(STDIN_FILENO, STDOUT_FILENO); + } else if (magic2 == 0x8b) { + check_header_gzip_or_die(STDIN_FILENO); + status = inflate_gunzip(STDIN_FILENO, STDOUT_FILENO); + } 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; +} + +int gunzip_main(int argc, char **argv); +int gunzip_main(int argc, char **argv) +{ + getopt32(argc, argv, "cftdv"); + argv += optind; + /* if called as zcat */ + if (applet_name[1] == 'c') + option_mask32 |= OPT_STDOUT; + + return unpack(argv, make_new_name_gunzip, unpack_gunzip); +} + +#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 +char* make_new_name_unlzma(char *filename) +{ + char *extension = strrchr(filename, '.'); + if (!extension || strcmp(extension, ".lzma") != 0) + return NULL; + *extension = '\0'; + return filename; +} + +static +USE_DESKTOP(long long) int unpack_unlzma(void) +{ + return unlzma(STDIN_FILENO, STDOUT_FILENO); +} + +int unlzma_main(int argc, char **argv); +int unlzma_main(int argc, char **argv) +{ + getopt32(argc, argv, "c"); + argv += optind; + /* lzmacat? */ + if (applet_name[4] == 'c') + option_mask32 |= OPT_STDOUT; + + return unpack(argv, make_new_name_unlzma, unpack_unlzma); +} + +#endif + + +/* vi: set sw=4 ts=4: */ +/* + * 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 +char* make_new_name_uncompress(char *filename) +{ + char *extension = strrchr(filename, '.'); + if (!extension || strcmp(extension, ".Z") != 0) + return NULL; + *extension = '\0'; + return filename; +} + +static +USE_DESKTOP(long long) int unpack_uncompress(void) +{ + USE_DESKTOP(long long) int status = -1; + + if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) { + bb_error_msg("invalid magic"); + } else { + status = uncompress(STDIN_FILENO, STDOUT_FILENO); + } + return status; +} + +int uncompress_main(int argc, char **argv); +int uncompress_main(int argc, char **argv) +{ + getopt32(argc, argv, "cf"); + argv += optind; + + return unpack(argv, make_new_name_uncompress, unpack_uncompress); +} + +#endif |