Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-18 07:31:34 +00:00
Code Issues Projects Releases Wiki Activity

rpm2cpio: code shrink

Browse Source 
function                                             old     new   delta
skip_header                                           94      92      -2
rpm2cpio_main                                        177     174      -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-5)               Total: -5 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-08-28 21:15:24 +02:00
parent 0a130d510d
commit e6c483ec30
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archival/rpm2cpio.c
View File

@ -23,7 +23,7 @@ struct rpm_lead {
char reserved[16]; char reserved[16];
}; };
#define RPM_HEADER_VERnMAGIC 0x8eade801 #define RPM_HEADER_MAGICnVER 0x8eade801
#define RPM_HEADER_MAGIC_STR "\216\255\350" #define RPM_HEADER_MAGIC_STR "\216\255\350"
struct rpm_header { struct rpm_header {
@ -33,7 +33,9 @@ struct rpm_header {
uint32_t size; /* Size of store (4 bytes) */ uint32_t size; /* Size of store (4 bytes) */
}; };
static unsigned skip_header(int rpm_fd) enum { rpm_fd = STDIN_FILENO };
static unsigned skip_header(void)
{ {
struct rpm_header header; struct rpm_header header;
unsigned len; unsigned len;
@ -45,9 +47,9 @@ static unsigned skip_header(int rpm_fd)
// if (header.version != 1) { // if (header.version != 1) {
// bb_error_msg_and_die("unsupported RPM header version"); // bb_error_msg_and_die("unsupported RPM header version");
// } // }
if (header.magic_and_ver != htonl(RPM_HEADER_VERnMAGIC)) { if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER)) {
bb_error_msg_and_die("invalid RPM header magic or unsupported version"); bb_error_msg_and_die("invalid RPM header magic or unsupported version");
// ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_VERnMAGIC)); // ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_MAGICnVER));
} }
/* Seek past index entries, and past store */ /* Seek past index entries, and past store */
@ -62,15 +64,12 @@ int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rpm2cpio_main(int argc UNUSED_PARAM, char **argv) int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
{ {
struct rpm_lead lead; struct rpm_lead lead;
int rpm_fd;
unsigned pos; unsigned pos;
unsigned char magic[2]; unsigned char magic[2];
IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd); IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
if (!argv[1]) { if (argv[1]) {
rpm_fd = STDIN_FILENO; xmove_fd(xopen(argv[1], O_RDONLY), rpm_fd);
} else {
rpm_fd = xopen(argv[1], O_RDONLY);
} }
xread(rpm_fd, &lead, sizeof(lead)); xread(rpm_fd, &lead, sizeof(lead));
@ -80,11 +79,11 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
} }
/* Skip the signature header, align to 8 bytes */ /* Skip the signature header, align to 8 bytes */
pos = skip_header(rpm_fd); pos = skip_header();
seek_by_jump(rpm_fd, (8 - pos) & 7); seek_by_jump(rpm_fd, (8 - pos) & 7);
/* Skip the main header */ /* Skip the main header */
skip_header(rpm_fd); skip_header();
xread(rpm_fd, &magic, 2); xread(rpm_fd, &magic, 2);
unpack = unpack_gz_stream; unpack = unpack_gz_stream;