Bump to version 1.22.1

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

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 5403aee..61adde7 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -4,34 +4,26 @@
  *
  * 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            0xedabeedb
-#define RPM_MAGIC_STR        "\355\253\356\333"
-
-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_MAGICnVER 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) */
-};
+#include "bb_archive.h"
+#include "rpm.h"
 
 enum { rpm_fd = STDIN_FILENO };
 
@@ -65,8 +57,6 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
 {
        struct rpm_lead lead;
        unsigned pos;
-       unsigned char magic[2];
-       IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
 
        if (argv[1]) {
                xmove_fd(xopen(argv[1], O_RDONLY), rpm_fd);
@@ -74,37 +64,33 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
        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();
-       seek_by_jump(rpm_fd, (8 - pos) & 7);
+       seek_by_jump(rpm_fd, (-(int)pos) & 7);
 
        /* Skip the main header */
        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");
-               }
-               unpack = unpack_bz2_stream;
-       }
+       //if (SEAMLESS_COMPRESSION)
+       //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
+       //      signal(SIGCHLD, check_errors_in_children);
 
-       if (unpack(rpm_fd, STDOUT_FILENO) < 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");
-       }
 
        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;
 }