route: fix for 64-bit BE machines by Seonghun Lim (wariua AT gmail.com)

[oweals/busybox.git] / archival / rpm2cpio.c

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 51807c7e236dd9745b79c621ca754d17ef0ce20c..ee938716f1437c3d1dbdb7a7c6b17229aeb49e8c 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -6,26 +6,21 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include <sys/types.h>
-#include <netinet/in.h> /* For ntohl & htonl function */
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #define RPM_MAGIC "\355\253\356\333"
 #define RPM_HEADER_MAGIC "\216\255\350"
 
 struct rpm_lead {
-    unsigned char magic[4];
-    uint8_t major, minor;
-    uint16_t type;
-    uint16_t archnum;
-    char name[66];
-    uint16_t osnum;
-    uint16_t signature_type;
-    char reserved[16];
+       unsigned char magic[4];
+       uint8_t major, minor;
+       uint16_t type;
+       uint16_t archnum;
+       char name[66];
+       uint16_t osnum;
+       uint16_t signature_type;
+       char reserved[16];
 };
 
 struct rpm_header {
@@ -40,12 +35,12 @@ static void skip_header(int rpm_fd)
 {
        struct rpm_header header;
 
-       bb_xread_all(rpm_fd, &header, sizeof(struct rpm_header));
+       xread(rpm_fd, &header, sizeof(struct rpm_header));
        if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
-               bb_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) {
-               bb_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);
@@ -54,6 +49,7 @@ static void skip_header(int rpm_fd)
 }
 
 /* No getopt required */
+int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm2cpio_main(int argc, char **argv)
 {
        struct rpm_lead lead;
@@ -63,12 +59,12 @@ int rpm2cpio_main(int argc, char **argv)
        if (argc == 1) {
                rpm_fd = STDIN_FILENO;
        } else {
-               rpm_fd = bb_xopen(argv[1], O_RDONLY);
+               rpm_fd = xopen(argv[1], O_RDONLY);
        }
 
-       bb_xread_all(rpm_fd, &lead, sizeof(struct rpm_lead));
+       xread(rpm_fd, &lead, sizeof(struct rpm_lead));
        if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) {
-               bb_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 */
@@ -78,14 +74,13 @@ int rpm2cpio_main(int argc, char **argv)
        /* Skip the main header */
        skip_header(rpm_fd);
 
-       bb_xread_all(rpm_fd, &magic, 2);
+       xread(rpm_fd, &magic, 2);
        if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-               bb_error_msg_and_die("Invalid gzip magic");
+               bb_error_msg_and_die("invalid gzip magic");
        }
 
-       check_header_gzip(rpm_fd);
-       if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) {
-               bb_error_msg("Error inflating");
+       if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
+               bb_error_msg("error inflating");
        }
 
        close(rpm_fd);