Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/rpm2cpio.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/rpm2cpio.c (modified) (2 diffs)

branches/3.3/mindi-busybox/archival/rpm2cpio.c

@@ -7 +7 @@
  * 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
@@ -72 +81 @@
 
     /* This works, but doesn't report uncompress errors (they happen in child) */
-    setup_unzip_on_fd(rpm_fd, /*fail_if_not_detected:*/ 1);
+    setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
     if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
         bb_error_msg_and_die("error unpacking");