From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 9 Jan 2010 19:25:42 +0000 (+0100)
Subject: cpio: fix -o-less cpio -F FILE
X-Git-Tag: 1_16_0~71
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02dd96f688994b5ef4f79a7cdf940b844d6ac52b;p=oweals%2Fbusybox.git

cpio: fix -o-less cpio -F FILE

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/cpio.c b/archival/cpio.c
index 5eb393d57..858e59b30 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -312,7 +312,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 	opt_complementary = "=0";
 	opt = getopt32(argv, OPTION_STR, &cpio_filename);
 	if (opt & CPIO_OPT_FILE) { /* -F */
-		archive_handle->src_fd = xopen(cpio_filename, O_RDONLY);
+		xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
 	}
 #else
 	/* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */