Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/xfunc_die.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/xfunc_die.c (modified) (1 diff)

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

@@ -8 +8 @@
  */
 
-/* Keeping it separate allows to NOT suck in stdio for VERY small applets.
+/* Keeping it separate allows to NOT pull in stdio for VERY small applets.
  * Try building busybox with only "true" enabled... */
 
 #include "libbb.h"
 
-int die_sleep;
-#if ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH
-jmp_buf die_jmp;
-#endif
+void (*die_func)(void);
 
 void FAST_FUNC xfunc_die(void)
 {
-    if (die_sleep) {
-        if ((ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH)
-         && die_sleep < 0
-        ) {
-            /* Special case. We arrive here if NOFORK applet
-             * calls xfunc, which then decides to die.
-             * We don't die, but jump instead back to caller.
-             * NOFORK applets still cannot carelessly call xfuncs:
-             * p = xmalloc(10);
-             * q = xmalloc(10); // BUG! if this dies, we leak p!
-             */
-            /* -2222 means "zero" (longjmp can't pass 0)
-             * run_nofork_applet() catches -2222. */
-            longjmp(die_jmp, xfunc_error_retval ? xfunc_error_retval : -2222);
-        }
-        sleep(die_sleep);
-    }
+    if (die_func)
+        die_func();
     exit(xfunc_error_retval);
 }