Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge

Conflicts:
	Makefile.flags
	scripts/basic/fixdep.c

1 files changed, 7 insertions, 2 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 0b0d84994..c96e5396a 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 enum {
         OPT_STDOUT     = 1 << 0,
@@ -103,7 +103,9 @@ int FAST_FUNC bbunpack(char **argv,
                 status = unpacker(&info);
                 if (status < 0)
                         exitcode = 1;
-                xclose(STDOUT_FILENO); /* with error check! */
+
+                if (!(option_mask32 & OPT_STDOUT))
+                        xclose(STDOUT_FILENO); /* with error check! */
 
                 if (filename) {
                         char *del = new_name;
@@ -145,6 +147,9 @@ int FAST_FUNC bbunpack(char **argv,
                 }
         } while (*argv && *++argv);
 
+        if (option_mask32 & OPT_STDOUT)
+                xclose(STDOUT_FILENO); /* with error check! */
+
         return exitcode;
 }