mirror of
https://github.com/sheumann/hush.git
synced 2024-10-05 12:54:51 +00:00
8a6a2f9c9c
This change makes "tar tf hello_world.txz" work without adding special-casing for ".txz" extension. It also removes ever-growing magic checking code in rpm2cpio and get_header_tar - we reuse one which lives in setup_unzip_on_fd. function old new delta unpack_gz_stream 7 566 +559 check_signature16 - 70 +70 setup_unzip_on_fd 99 142 +43 handle_SIGCHLD - 41 +41 unpack_bz2_stream 342 376 +34 unzip_main 2352 2385 +33 bbunpack 503 533 +30 open_transformer 74 102 +28 unpack_Z_stream 1278 1304 +26 unpack_gunzip 101 123 +22 init_transformer_aux_data - 18 +18 unpack_xz_stream 2388 2402 +14 open_zipped 131 141 +10 rpm_main 1358 1363 +5 get_header_tar_lzma 52 57 +5 get_header_tar_bz2 52 57 +5 unpack_lzma_stream 2698 2702 +4 hash_find 234 233 -1 get_header_tar 1759 1733 -26 get_header_tar_gz 92 57 -35 unpack_uncompress 51 12 -39 rpm2cpio_main 201 147 -54 unpack_unxz 67 12 -55 unpack_bz2_stream_prime 55 - -55 get_header_tar_Z 86 - -86 unpack_gz_stream_with_info 539 - -539 ------------------------------------------------------------------------------ (add/remove: 3/3 grow/shrink: 14/6 up/down: 947/-890) Total: 57 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
109 lines
2.7 KiB
C
109 lines
2.7 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini rpm2cpio implementation for busybox
|
|
*
|
|
* Copyright (C) 2001 by Laurence Anderson
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
|
|
//usage:#define rpm2cpio_trivial_usage
|
|
//usage: "package.rpm"
|
|
//usage:#define rpm2cpio_full_usage "\n\n"
|
|
//usage: "Output a cpio archive of the rpm file"
|
|
|
|
#include "libbb.h"
|
|
#include "bb_archive.h"
|
|
#include "rpm.h"
|
|
|
|
enum { rpm_fd = STDIN_FILENO };
|
|
|
|
static unsigned skip_header(void)
|
|
{
|
|
struct rpm_header header;
|
|
unsigned len;
|
|
|
|
xread(rpm_fd, &header, sizeof(header));
|
|
// if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC_STR, 3) != 0) {
|
|
// bb_error_msg_and_die("invalid RPM header magic");
|
|
// }
|
|
// if (header.version != 1) {
|
|
// bb_error_msg_and_die("unsupported RPM header version");
|
|
// }
|
|
if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER)) {
|
|
bb_error_msg_and_die("invalid RPM header magic or unsupported version");
|
|
// ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_MAGICnVER));
|
|
}
|
|
|
|
/* Seek past index entries, and past store */
|
|
len = 16 * ntohl(header.entries) + ntohl(header.size);
|
|
seek_by_jump(rpm_fd, len);
|
|
|
|
return sizeof(header) + len;
|
|
}
|
|
|
|
#if SEAMLESS_COMPRESSION
|
|
static void handle_SIGCHLD(int signo UNUSED_PARAM)
|
|
{
|
|
int status;
|
|
|
|
/* Wait for any child without blocking */
|
|
for (;;) {
|
|
if (wait_any_nohang(&status) < 0)
|
|
/* wait failed?! I'm confused... */
|
|
return;
|
|
if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
|
|
/* this child exited with 0 */
|
|
continue;
|
|
/* Cannot happen?
|
|
if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; */
|
|
bb_got_signal = 1;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* No getopt required */
|
|
int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
struct rpm_lead lead;
|
|
unsigned pos;
|
|
|
|
if (argv[1]) {
|
|
xmove_fd(xopen(argv[1], O_RDONLY), rpm_fd);
|
|
}
|
|
xread(rpm_fd, &lead, sizeof(lead));
|
|
|
|
/* Just check the magic, the rest is irrelevant */
|
|
if (lead.magic != htonl(RPM_LEAD_MAGIC)) {
|
|
bb_error_msg_and_die("invalid RPM magic");
|
|
}
|
|
|
|
/* Skip the signature header, align to 8 bytes */
|
|
pos = skip_header();
|
|
seek_by_jump(rpm_fd, (-(int)pos) & 7);
|
|
|
|
/* Skip the main header */
|
|
skip_header();
|
|
|
|
#if SEAMLESS_COMPRESSION
|
|
/* We need to know whether child (gzip/bzip/etc) exits abnormally */
|
|
signal(SIGCHLD, handle_SIGCHLD);
|
|
#endif
|
|
|
|
/* This works, but doesn't report uncompress errors (they happen in child) */
|
|
setup_unzip_on_fd(rpm_fd, /*fail_if_not_detected:*/ 1);
|
|
if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
|
|
bb_error_msg_and_die("error unpacking");
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
close(rpm_fd);
|
|
}
|
|
|
|
#if SEAMLESS_COMPRESSION
|
|
return bb_got_signal;
|
|
#else
|
|
return EXIT_SUCCESS;
|
|
#endif
|
|
}
|