use user's shell instead of hardwired "/bin/sh" (android needs this)

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

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index b23d5afa9669ba71c87560537e4b2b09fea2bbc8..ce8cd2c2cff5880cedb7a5c3311c1c0fd4a8dc52 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -4,10 +4,10 @@
  *
  * 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.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 
 enum { rpm_fd = STDIN_FILENO };
@@ -87,8 +87,6 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
                if (ENABLE_FEATURE_SEAMLESS_XZ
                 && magic.b16[0] == XZ_MAGIC1
                ) {
-                       /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
-                       /* More info at: http://tukaani.org/xz/xz-file-format.txt */
                        xread(rpm_fd, magic.b32, sizeof(magic.b32[0]));
                        if (magic.b32[0] != XZ_MAGIC2)
                                goto no_magic;