--- trunk/mkinitrd-magellan/busybox/archival/rpm2cpio.c	2009/04/24 18:32:46	815
+++ trunk/mkinitrd-magellan/busybox/archival/rpm2cpio.c	2009/04/24 18:33:46	816
@@ -6,21 +6,21 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#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 {
@@ -49,6 +49,7 @@
 }
 
 /* No getopt required */
+int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm2cpio_main(int argc, char **argv)
 {
 	struct rpm_lead lead;
@@ -78,8 +79,7 @@
 		bb_error_msg_and_die("invalid gzip magic");
 	}
 
-	check_header_gzip(rpm_fd);
-	if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) {
+	if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
 		bb_error_msg("error inflating");
 	}