diff options
author | Ron Yorston <rmy@pobox.com> | 2018-03-15 08:49:48 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-03-15 08:49:48 +0000 |
commit | 6fe4ad9a6c96624c2b75c0d51b035bc1a71d9eba (patch) | |
tree | bb7620a3217f5adf6fb5f3358b2b89a97331b5e8 /libbb/vfork_daemon_rexec.c | |
parent | f3d24e08a385a68c4bacb284bd8a8e3da7f0f4b3 (diff) | |
parent | bbe47d9b9aee3824845f1ce08c9caeb262c15059 (diff) | |
download | busybox-w32-6fe4ad9a6c96624c2b75c0d51b035bc1a71d9eba.tar.gz busybox-w32-6fe4ad9a6c96624c2b75c0d51b035bc1a71d9eba.tar.bz2 busybox-w32-6fe4ad9a6c96624c2b75c0d51b035bc1a71d9eba.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/vfork_daemon_rexec.c')
-rw-r--r-- | libbb/vfork_daemon_rexec.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c index 1c24f0d10..569a6fc34 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c | |||
@@ -14,14 +14,6 @@ | |||
14 | * | 14 | * |
15 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 15 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
16 | */ | 16 | */ |
17 | #include <sys/prctl.h> | ||
18 | #ifndef PR_SET_NAME | ||
19 | #define PR_SET_NAME 15 | ||
20 | #endif | ||
21 | #ifndef PR_GET_NAME | ||
22 | #define PR_GET_NAME 16 | ||
23 | #endif | ||
24 | |||
25 | #include "busybox.h" /* uses applet tables */ | 17 | #include "busybox.h" /* uses applet tables */ |
26 | #include "NUM_APPLETS.h" | 18 | #include "NUM_APPLETS.h" |
27 | 19 | ||
@@ -29,6 +21,13 @@ | |||
29 | #define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)) | 21 | #define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)) |
30 | 22 | ||
31 | #if defined(__linux__) && (NUM_APPLETS > 1) | 23 | #if defined(__linux__) && (NUM_APPLETS > 1) |
24 | # include <sys/prctl.h> | ||
25 | # ifndef PR_SET_NAME | ||
26 | # define PR_SET_NAME 15 | ||
27 | # endif | ||
28 | # ifndef PR_GET_NAME | ||
29 | # define PR_GET_NAME 16 | ||
30 | # endif | ||
32 | void FAST_FUNC set_task_comm(const char *comm) | 31 | void FAST_FUNC set_task_comm(const char *comm) |
33 | { | 32 | { |
34 | /* okay if too long (truncates) */ | 33 | /* okay if too long (truncates) */ |