From: Matt Kraai <kraai@debian.org>
Date: Sun, 18 May 2003 21:12:36 +0000 (-0000)
Subject: Handle -O preceding -x.
X-Git-Tag: 1_00_pre1~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0861e828d028cdb6ad0798143a88c9eb6fabb631;p=oweals%2Fbusybox.git

Handle -O preceding -x.
---

diff --git a/archival/tar.c b/archival/tar.c
index 00f9f87af..29244d4bf 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -645,7 +645,9 @@ int tar_main(int argc, char **argv)
 			break;
 		case 'x':
 			ctx_flag |= CTX_EXTRACT;
-			tar_handle->action_data = data_extract_all;
+			if (tar_handle->action_data != data_extract_to_stdout) {
+				tar_handle->action_data = data_extract_all;
+			}
 			break;
 
 			/* These are optional */
diff --git a/testsuite/tar/tar-extracts-to-standard-output b/testsuite/tar/tar-extracts-to-standard-output
new file mode 100644
index 000000000..ca48e364e
--- /dev/null
+++ b/testsuite/tar/tar-extracts-to-standard-output
@@ -0,0 +1,3 @@
+echo foo > foo
+tar cf foo.tar foo
+cat foo.tar | busybox tar Ox | cmp foo -