tar: support -T - and -X -

[oweals/busybox.git] / libbb / fflush_stdout_and_exit.c

diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index ae68222b4b10f886118d4ebe9057a0229e7deb64..9ad5dbf968f536147221edde0081f9a38949dbec 100644 (file)
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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.
  */
 
 /* Attempt to fflush(stdout), and exit with an error code if stdout is
@@ -13,13 +13,17 @@
 
 #include "libbb.h"
 
-// TODO: make it safe to call from NOFORK applets
-// Currently, it can exit(0). Even if it is made to do longjmp trick
-// (see sleep_and_die internals), zero cannot be passed thru this way!
-
-void fflush_stdout_and_exit(int retval)
+void FAST_FUNC fflush_stdout_and_exit(int retval)
 {
        if (fflush(stdout))
-               sleep_and_die();
+               bb_perror_msg_and_die(bb_msg_standard_output);
+
+       if (ENABLE_FEATURE_PREFER_APPLETS && die_sleep < 0) {
+               /* We are in NOFORK applet. Do not exit() directly,
+                * but use xfunc_die() */
+               xfunc_error_retval = retval;
+               xfunc_die();
+       }
+
        exit(retval);
 }