emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

standalone shell / prefer_applets: fix "exe" in comm fields

Browse Source 
function                                             old     new   delta
main                                                  92     106     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-29 02:19:01 +02:00
parent 00a1dbd230
commit 147d2ce3dd
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libbb/appletlib.c
View File

@ -34,6 +34,13 @@
# include <malloc.h> /* for mallopt */ # include <malloc.h> /* for mallopt */
#endif #endif
#include <sys/prctl.h>
#ifndef PR_SET_NAME
#define PR_SET_NAME 15
#endif
#ifndef PR_GET_NAME
#define PR_GET_NAME 16
#endif
/* Declare <applet>_main() */ /* Declare <applet>_main() */
#define PROTOTYPES #define PROTOTYPES
@ -1056,6 +1063,17 @@ int main(int argc UNUSED_PARAM, char **argv)
if (applet_name[0] == '-') if (applet_name[0] == '-')
applet_name++; applet_name++;
applet_name = bb_basename(applet_name); applet_name = bb_basename(applet_name);
# if defined(__linux__)
/* If we are a result of execv("/proc/self/exe"), fix ugly comm of "exe" */
if (ENABLE_FEATURE_SH_STANDALONE
|| ENABLE_FEATURE_PREFER_APPLETS
|| !BB_MMU
) {
prctl(PR_SET_NAME, (long)applet_name, 0, 0, 0);
}
# endif
parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */ parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
run_applet_and_exit(applet_name, argv); run_applet_and_exit(applet_name, argv);