projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Syncronise some build files with busybox-cvs-20030819
[oweals/busybox.git]
/
archival
/
rpm2cpio.c
diff --git
a/archival/rpm2cpio.c
b/archival/rpm2cpio.c
index e1e93988f66e29c78786b6be00c0de6b94314c34..bb9f69573cb3042020e1ded0bd3e0eb9771c2465 100644
(file)
--- a/
archival/rpm2cpio.c
+++ b/
archival/rpm2cpio.c
@@
-52,12
+52,12
@@
void skip_header(int rpm_fd)
{
struct rpm_header header;
{
struct rpm_header header;
- xread_all(rpm_fd, &header, sizeof(struct rpm_header));
+
bb_
xread_all(rpm_fd, &header, sizeof(struct rpm_header));
if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
- error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */
+
bb_
error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */
}
if (header.version != 1) {
}
if (header.version != 1) {
- error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
+
bb_
error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
}
header.entries = ntohl(header.entries);
header.size = ntohl(header.size);
}
header.entries = ntohl(header.entries);
header.size = ntohl(header.size);
@@
-70,28
+70,34
@@
extern int rpm2cpio_main(int argc, char **argv)
{
struct rpm_lead lead;
int rpm_fd;
{
struct rpm_lead lead;
int rpm_fd;
+ unsigned char magic[2];
if (argc == 1) {
rpm_fd = fileno(stdin);
} else {
if (argc == 1) {
rpm_fd = fileno(stdin);
} else {
- rpm_fd = xopen(argv[1], O_RDONLY);
+ rpm_fd =
bb_
xopen(argv[1], O_RDONLY);
}
}
- xread_all(rpm_fd, &lead, sizeof(struct rpm_lead));
+
bb_
xread_all(rpm_fd, &lead, sizeof(struct rpm_lead));
if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) {
if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) {
- error_msg_and_die("Invalid RPM magic"); /* Just check the magic, the rest is irrelevant */
+
bb_
error_msg_and_die("Invalid RPM magic"); /* Just check the magic, the rest is irrelevant */
}
/* Skip the signature header */
skip_header(rpm_fd);
}
/* Skip the signature header */
skip_header(rpm_fd);
-
data_align(rpm_fd, lseek(rpm_fd, 0, SEEK_CUR), 8
);
+
lseek(rpm_fd, (8 - (lseek(rpm_fd, 0, SEEK_CUR) % 8)) % 8, SEEK_CUR
);
/* Skip the main header */
skip_header(rpm_fd);
/* Skip the main header */
skip_header(rpm_fd);
+
+ bb_xread_all(rpm_fd, &magic, 2);
+ if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
+ bb_error_msg_and_die("Invalid gzip magic");
+ }
check_header_gzip(rpm_fd);
if (inflate(rpm_fd, fileno(stdout)) != 0) {
check_header_gzip(rpm_fd);
if (inflate(rpm_fd, fileno(stdout)) != 0) {
- error_msg("Error inflating");
+
bb_
error_msg("Error inflating");
}
check_trailer_gzip(rpm_fd);
}
check_trailer_gzip(rpm_fd);