Merge branch 'busybox' into merge

1 files changed, 14 insertions, 9 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index e1f8bf432..6c0be4a83 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -262,8 +262,7 @@ void lbb_prepare(const char *applet
                 IF_FEATURE_INDIVIDUAL(, char **argv))
 {
 #ifdef bb_cached_errno_ptr
-        (*(int **)not_const_pp(&bb_errno)) = get_perrno();
-        barrier();
+        ASSIGN_CONST_PTR(&bb_errno, get_perrno());
 #endif
         applet_name = applet;
 
@@ -767,9 +766,9 @@ int scripted_main(int argc UNUSED_PARAM, char **argv)
         int script = find_script_by_name(applet_name);
         if (script >= 0)
 #  if ENABLE_SHELL_ASH
-                exit(ash_main(-script - 1, argv));
+                return ash_main(-script - 1, argv);
 #  elif ENABLE_SHELL_HUSH
-                exit(hush_main(-script - 1, argv));
+                return hush_main(-script - 1, argv);
 #  else
                 return 1;
 #  endif
@@ -1161,10 +1160,10 @@ int scripted_main(int argc UNUSED_PARAM, char **argv)
 {
 #  if ENABLE_SHELL_ASH
         int script = 0;
-        exit(ash_main(-script - 1, argv));
+        return ash_main(-script - 1, argv);
 #  elif ENABLE_SHELL_HUSH
         int script = 0;
-        exit(hush_main(-script - 1, argv));
+        return hush_main(-script - 1, argv);
 #  else
         return 1;
 #  endif
@@ -1282,7 +1281,7 @@ int main(int argc UNUSED_PARAM, char **argv)
 
         full_write2_str(bb_basename(argv[0]));
         full_write2_str(": no applets enabled\n");
-        exit(127);
+        return 127;
 
 #else
 
@@ -1314,8 +1313,14 @@ int main(int argc UNUSED_PARAM, char **argv)
          || ENABLE_FEATURE_PREFER_APPLETS
          || !BB_MMU
         ) {
-                if (NUM_APPLETS > 1)
-                        set_task_comm(applet_name);
+                if (NUM_APPLETS > 1) {
+                        /* Careful, do not trash comm of "SCRIPT.sh" -
+                         * the case when started from e.g. #!/bin/ash script.
+                         * (not limited to shells - #!/bin/awk scripts also exist)
+                         */
+                        if (re_execed_comm())
+                                set_task_comm(applet_name);
+                }
         }
 
         parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */