Bump to version 1.22.1

[platform/upstream/busybox.git] / archival / rpm2cpio.c

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index dcd9265..61adde7 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -4,87 +4,93 @@
  *
  * Copyright (C) 2001 by Laurence Anderson
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//config:config RPM2CPIO
+//config:      bool "rpm2cpio"
+//config:      default y
+//config:      help
+//config:        Converts a RPM file into a CPIO archive.
+
+//applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
+
+//usage:#define rpm2cpio_trivial_usage
+//usage:       "package.rpm"
+//usage:#define rpm2cpio_full_usage "\n\n"
+//usage:       "Output a cpio archive of the rpm file"
+
 #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];
-};
-
-struct rpm_header {
-       char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
-       uint8_t version; /* 1 byte version number */
-       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 void skip_header(int rpm_fd)
+#include "bb_archive.h"
+#include "rpm.h"
+
+enum { rpm_fd = STDIN_FILENO };
+
+static unsigned skip_header(void)
 {
        struct rpm_header header;
+       unsigned len;
 
-       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 */
-       }
-       if (header.version != 1) {
-               bb_error_msg_and_die("unsupported RPM header version"); /* This program only supports v1 headers */
+       xread(rpm_fd, &header, sizeof(header));
+//     if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC_STR, 3) != 0) {
+//             bb_error_msg_and_die("invalid RPM header magic");
+//     }
+//     if (header.version != 1) {
+//             bb_error_msg_and_die("unsupported RPM header version");
+//     }
+       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_MAGICnVER));
        }
-       header.entries = ntohl(header.entries);
-       header.size = ntohl(header.size);
-       lseek (rpm_fd, 16 * header.entries, SEEK_CUR); /* Seek past index entries */
-       lseek (rpm_fd, header.size, SEEK_CUR); /* Seek past store */
+
+       /* Seek past index entries, and past store */
+       len = 16 * ntohl(header.entries) + ntohl(header.size);
+       seek_by_jump(rpm_fd, len);
+
+       return sizeof(header) + len;
 }
 
 /* No getopt required */
-int rpm2cpio_main(int argc, char **argv);
-int rpm2cpio_main(int argc, char **argv)
+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 char magic[2];
+       unsigned pos;
 
-       if (argc == 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));
 
-       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 */
+       /* Just check the magic, the rest is irrelevant */
+       if (lead.magic != htonl(RPM_LEAD_MAGIC)) {
+               bb_error_msg_and_die("invalid RPM magic");
        }
 
-       /* Skip the signature header */
-       skip_header(rpm_fd);
-       lseek(rpm_fd, (8 - (lseek(rpm_fd, 0, SEEK_CUR) % 8)) % 8, SEEK_CUR);
+       /* Skip the signature header, align to 8 bytes */
+       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);
-       if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-               bb_error_msg_and_die("invalid gzip magic");
-       }
+       //if (SEAMLESS_COMPRESSION)
+       //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
+       //      signal(SIGCHLD, check_errors_in_children);
 
-       check_header_gzip_or_die(rpm_fd);
-       if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
-               bb_error_msg("error inflating");
-       }
+       /* 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");
 
-       close(rpm_fd);
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               close(rpm_fd);
+       }
 
-       return 0;
+       if (SEAMLESS_COMPRESSION) {
+               check_errors_in_children(0);
+               return bb_got_signal;
+       }
+       return EXIT_SUCCESS;
 }