gen_build_files.sh uses bashism, document it

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

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 30ec80e22a3a64cc229f803268e9995c29266d9e..4ed5b023be2147b9ffae5dd25aded81dfceec039 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -8,32 +8,11 @@
  */
 #include "libbb.h"
 #include "unarchive.h"
+#include "rpm.h"
 
-#define RPM_MAGIC            0xedabeedb
-#define RPM_MAGIC_STR        "\355\253\356\333"
+enum { rpm_fd = STDIN_FILENO };
 
-struct rpm_lead {
-       uint32_t magic;
-       uint8_t major, minor;
-       uint16_t type;
-       uint16_t archnum;
-       char name[66];
-       uint16_t osnum;
-       uint16_t signature_type;
-       char reserved[16];
-};
-
-#define RPM_HEADER_VERnMAGIC 0x8eade801
-#define RPM_HEADER_MAGIC_STR "\216\255\350"
-
-struct rpm_header {
-       uint32_t magic_and_ver; /* 3 byte magic: 0x8e 0xad 0xe8; 1 byte version */
-       uint32_t reserved; /* 4 bytes reserved */
-       uint32_t entries; /* Number of entries in header (4 bytes) */
-       uint32_t size; /* Size of store (4 bytes) */
-};
-
-static unsigned skip_header(int rpm_fd)
+static unsigned skip_header(void)
 {
        struct rpm_header header;
        unsigned len;
@@ -45,9 +24,9 @@ static unsigned skip_header(int rpm_fd)
 //     if (header.version != 1) {
 //             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");
-               // ": %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 */
@@ -62,46 +41,53 @@ int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
 {
        struct rpm_lead lead;
-       int rpm_fd;
        unsigned pos;
-       unsigned char magic[2];
-       IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
 
-       if (!argv[1]) {
-               rpm_fd = STDIN_FILENO;
-       } else {
-               rpm_fd = xopen(argv[1], O_RDONLY);
+       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_MAGIC)) {
+       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(rpm_fd);
-       seek_by_jump(rpm_fd, (8 - pos) & 7);
+       pos = skip_header();
+       seek_by_jump(rpm_fd, (-(int)pos) & 7);
 
        /* Skip the main header */
-       skip_header(rpm_fd);
+       skip_header();
 
-       xread(rpm_fd, &magic, 2);
-       unpack = unpack_gz_stream;
-       if (magic[0] != 0x1f || magic[1] != 0x8b) {
-               if (!ENABLE_FEATURE_SEAMLESS_BZ2
-                || magic[0] != 'B' || magic[1] != 'Z'
-               ) {
-                       bb_error_msg_and_die("invalid gzip"
-                                       IF_FEATURE_SEAMLESS_BZ2("/bzip2")
-                                       " magic");
+#if 0
+       /* 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");
+#else
+       /* BLOAT */
+       {
+               unsigned char magic[2];
+               IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
+
+               xread(rpm_fd, &magic, 2);
+               unpack = unpack_gz_stream;
+               if (magic[0] != 0x1f || magic[1] != 0x8b) {
+                       if (!ENABLE_FEATURE_SEAMLESS_BZ2
+                        || magic[0] != 'B' || magic[1] != 'Z'
+                       ) {
+                               bb_error_msg_and_die("invalid gzip"
+                                               IF_FEATURE_SEAMLESS_BZ2("/bzip2")
+                                               " magic");
+                       }
+                       unpack = unpack_bz2_stream;
                }
-               unpack = unpack_bz2_stream;
-       }
 
-       if (unpack(rpm_fd, STDOUT_FILENO) < 0) {
-               bb_error_msg_and_die("error unpacking");
+               if (unpack(rpm_fd, STDOUT_FILENO) < 0)
+                       bb_error_msg_and_die("error unpacking");
        }
+#endif
 
        if (ENABLE_FEATURE_CLEAN_UP) {
                close(rpm_fd);