Start 1.33.0 development cycle

[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 48889dae85ac4beb4e2d72324a1f5a2093dad847..5df74170e0aa79a4f987c353ba3b9dac33944b8e 100644 (file)
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -4,26 +4,19 @@
  *
  * 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.
  */
+#include "libbb.h"
 
 /* Attempt to fflush(stdout), and exit with an error code if stdout is
  * in an error state.
  */
-
-#include "libbb.h"
-
-void fflush_stdout_and_exit(int retval)
+void FAST_FUNC fflush_stdout_and_exit(int retval)
 {
+       xfunc_error_retval = retval;
        if (fflush(stdout))
-               xfunc_die();
-
-       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);
+               bb_simple_perror_msg_and_die(bb_msg_standard_output);
+       /* In case we are in NOFORK applet. Do not exit() directly,
+        * but use xfunc_die() */
+       xfunc_die();
 }