diff options
author | Manuel Novoa III | 2003-03-19 09:13:01 +0000 |
---|---|---|
committer | Manuel Novoa III | 2003-03-19 09:13:01 +0000 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /archival/rpm2cpio.c | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
download | busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz |
Major coreutils update.
Diffstat (limited to 'archival/rpm2cpio.c')
-rw-r--r-- | archival/rpm2cpio.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index 66f6808..bb9f695 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c @@ -52,12 +52,12 @@ void skip_header(int rpm_fd) { 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) { - 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) { - 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); @@ -75,12 +75,12 @@ extern int rpm2cpio_main(int argc, char **argv) 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) { - 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 */ @@ -90,14 +90,14 @@ extern int rpm2cpio_main(int argc, char **argv) /* Skip the main header */ skip_header(rpm_fd); - xread_all(rpm_fd, &magic, 2); + bb_xread_all(rpm_fd, &magic, 2); if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { - error_msg_and_die("Invalid gzip magic"); + bb_error_msg_and_die("Invalid gzip magic"); } 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); |