Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/fflush_stdout_and_exit.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/fflush_stdout_and_exit.c (modified) (1 diff)

branches/3.3/mindi-busybox/libbb/fflush_stdout_and_exit.c

@@ -16 +16 @@
 void FAST_FUNC fflush_stdout_and_exit(int retval)
 {
+    xfunc_error_retval = retval;
     if (fflush(stdout))
         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);
+    /* In case we are in NOFORK applet. Do not exit() directly,
+     * but use xfunc_die() */
+    xfunc_die();
 }