diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/Makefile.in | 2 | ||||
| -rw-r--r-- | libbb/unzip.c | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/libbb/Makefile.in b/libbb/Makefile.in index 6d098c0..c6493bf 100644 --- a/libbb/Makefile.in +++ b/libbb/Makefile.in @@ -34,7 +34,7 @@ LIBBB_SRC:= \ my_getpwuid.c parse_mode.c parse_number.c perror_msg.c perror_msg_and_die.c \ print_file.c process_escape_sequence.c read_package_field.c recursive_action.c \ safe_read.c safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \ - trim.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \ + trim.c unzip.c uncompress.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \ xgetcwd.c xreadlink.c xregcomp.c interface.c remove_file.c last_char_is.c \ copyfd.c vherror_msg.c herror_msg.c herror_msg_and_die.c xgethostbyname.c \ dirname.c make_directory.c create_icmp_socket.c u_signal_names.c arith.c \ diff --git a/libbb/unzip.c b/libbb/unzip.c index 9f6ed2e..cde16d0 100644 --- a/libbb/unzip.c +++ b/libbb/unzip.c @@ -65,8 +65,13 @@ static char *license_msg[] = { #include <signal.h> #include <stdlib.h> #include <string.h> +#include "config.h" #include "libbb.h" +#ifdef CONFIG_FEATURE_UNCOMPRESS +int uncompress ( FILE *in, FILE *out ); +#endif + static FILE *in_file, *out_file; /* these are freed by gz_close */ @@ -911,6 +916,7 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file) unsigned char flags; /* compression flags */ typedef void (*sig_type) (int); unsigned short i; + unsigned char magic [2]; if (signal(SIGINT, SIG_IGN) != SIG_IGN) { (void) signal(SIGINT, (sig_type) abort_gzip); @@ -926,8 +932,18 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file) } #endif + magic [0] = fgetc(l_in_file); + magic [1] = fgetc(l_in_file); + +#ifdef CONFIG_FEATURE_UNCOMPRESS + /* Magic header for compress files, 1F 9d = \037\235 */ + if (( magic [0] == 0x1F ) && ( magic [1] == 0x9d)) { + return uncompress ( l_in_file, l_out_file ); + } +#endif + /* Magic header for gzip files, 1F 8B = \037\213 */ - if ((fgetc(l_in_file) != 0x1F) || (fgetc(l_in_file) != 0x8b)) { + if (( magic [0] != 0x1F ) || ( magic [1] != 0x8b)) { error_msg("Invalid gzip magic"); return EXIT_FAILURE; } |