Merge branch busybox (up to "ash: comment out free(p) just before...")

1 files changed, 11 insertions, 1 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 28adf2740..4aa40454f 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -930,7 +930,9 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
         }
         if (ENABLE_FEATURE_SUID)
                 check_suid(applet_no);
-        exit(applet_main[applet_no](argc, argv));
+        xfunc_error_retval = applet_main[applet_no](argc, argv);
+        /* Note: applet_main() may also not return (die on a xfunc or such) */
+        xfunc_die();
 }
 # endif /* NUM_APPLETS > 0 */
 
@@ -993,6 +995,14 @@ int main(int argc UNUSED_PARAM, char **argv)
          */
         mallopt(M_MMAP_THRESHOLD, 32 * 1024 - 256);
 #endif
+#if 0 /*def M_TOP_PAD*/
+        /* When the program break is increased, then M_TOP_PAD bytes are added
+         * to the sbrk(2) request. When the heap is trimmed because of free(3),
+         * this much free space is preserved at the top of the heap.
+         * glibc default seems to be way too big: 128k, but need to verify.
+         */
+        mallopt(M_TOP_PAD, 8 * 1024);
+#endif
 
 #if !BB_MMU
         /* NOMMU re-exec trick sets high-order bit in first byte of name */