diff options
-rw-r--r-- | include/applets.h | 3 | ||||
-rw-r--r-- | include/usage.h | 6 | ||||
-rw-r--r-- | miscutils/Config.in | 6 | ||||
-rw-r--r-- | miscutils/Makefile.in | 1 | ||||
-rw-r--r-- | miscutils/setsid.c | 46 |
5 files changed, 62 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index d6aee5599..e2fe25167 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -558,6 +558,9 @@ | |||
558 | #ifdef CONFIG_SETKEYCODES | 558 | #ifdef CONFIG_SETKEYCODES |
559 | APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | 559 | APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) |
560 | #endif | 560 | #endif |
561 | #ifdef CONFIG_SETSID | ||
562 | APPLET(setsid, setsid_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | ||
563 | #endif | ||
561 | #if defined(CONFIG_FEATURE_SH_IS_ASH) && defined(CONFIG_ASH) | 564 | #if defined(CONFIG_FEATURE_SH_IS_ASH) && defined(CONFIG_ASH) |
562 | APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN, _BB_SUID_NEVER) | 565 | APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN, _BB_SUID_NEVER) |
563 | #elif defined(CONFIG_FEATURE_SH_IS_HUSH) && defined(CONFIG_HUSH) | 566 | #elif defined(CONFIG_FEATURE_SH_IS_HUSH) && defined(CONFIG_HUSH) |
diff --git a/include/usage.h b/include/usage.h index 5d7c36551..dc8058a20 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -2375,6 +2375,12 @@ | |||
2375 | #define setkeycodes_example_usage \ | 2375 | #define setkeycodes_example_usage \ |
2376 | "$ setkeycodes e030 127\n" | 2376 | "$ setkeycodes e030 127\n" |
2377 | 2377 | ||
2378 | #define setsid_trivial_usage \ | ||
2379 | "program [arg ...]" | ||
2380 | #define setsid_full_usage \ | ||
2381 | "Runs any program in a new session by calling setsid() before\n" \ | ||
2382 | "exec'ing the rest of its arguments. See setsid(2) for details." | ||
2383 | |||
2378 | #define lash_trivial_usage \ | 2384 | #define lash_trivial_usage \ |
2379 | "[FILE]...\n" \ | 2385 | "[FILE]...\n" \ |
2380 | "or: sh -c command [args]..." | 2386 | "or: sh -c command [args]..." |
diff --git a/miscutils/Config.in b/miscutils/Config.in index 69a330058..6c68cd08e 100644 --- a/miscutils/Config.in +++ b/miscutils/Config.in | |||
@@ -215,6 +215,12 @@ config CONFIG_STRINGS | |||
215 | strings prints the printable character sequences for each file | 215 | strings prints the printable character sequences for each file |
216 | specified. | 216 | specified. |
217 | 217 | ||
218 | config CONFIG_SETSID | ||
219 | bool "setsid" | ||
220 | default n | ||
221 | help | ||
222 | setsid runs a program in a new session | ||
223 | |||
218 | config CONFIG_TIME | 224 | config CONFIG_TIME |
219 | bool "time" | 225 | bool "time" |
220 | default n | 226 | default n |
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in index d4c5ff76b..8c53104ed 100644 --- a/miscutils/Makefile.in +++ b/miscutils/Makefile.in | |||
@@ -36,6 +36,7 @@ MISCUTILS-$(CONFIG_LAST) += last.o | |||
36 | MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o | 36 | MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o |
37 | MISCUTILS-$(CONFIG_MT) += mt.o | 37 | MISCUTILS-$(CONFIG_MT) += mt.o |
38 | MISCUTILS-$(CONFIG_RX) += rx.o | 38 | MISCUTILS-$(CONFIG_RX) += rx.o |
39 | MISCUTILS-$(CONFIG_SETSID) += setsid.o | ||
39 | MISCUTILS-$(CONFIG_STRINGS) += strings.o | 40 | MISCUTILS-$(CONFIG_STRINGS) += strings.o |
40 | MISCUTILS-$(CONFIG_TIME) += time.o | 41 | MISCUTILS-$(CONFIG_TIME) += time.o |
41 | MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o | 42 | MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o |
diff --git a/miscutils/setsid.c b/miscutils/setsid.c new file mode 100644 index 000000000..7df35be3b --- /dev/null +++ b/miscutils/setsid.c | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * setsid.c -- execute a command in a new session | ||
3 | * Rick Sladkey <jrs@world.std.com> | ||
4 | * In the public domain. | ||
5 | * | ||
6 | * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> | ||
7 | * - added Native Language Support | ||
8 | * | ||
9 | * 2001-01-18 John Fremlin <vii@penguinpowered.com> | ||
10 | * - fork in case we are process group leader | ||
11 | * | ||
12 | * 2004-11-12 Paul Fox | ||
13 | * - busyboxed | ||
14 | */ | ||
15 | |||
16 | #include <stdio.h> | ||
17 | #include <unistd.h> | ||
18 | #include <stdlib.h> | ||
19 | #include "busybox.h" | ||
20 | |||
21 | int | ||
22 | setsid_main(int argc, char *argv[]) { | ||
23 | |||
24 | if (argc < 2) { | ||
25 | bb_show_usage(); | ||
26 | } | ||
27 | |||
28 | if (getpgrp() == getpid()) { | ||
29 | switch(fork()){ | ||
30 | case -1: | ||
31 | bb_perror_msg_and_die("fork"); | ||
32 | case 0: | ||
33 | break; | ||
34 | default: /* parent */ | ||
35 | exit(0); | ||
36 | } | ||
37 | /* child falls through */ | ||
38 | } | ||
39 | |||
40 | setsid(); /* no error possible */ | ||
41 | |||
42 | execvp(argv[1], argv + 1); | ||
43 | |||
44 | bb_perror_msg_and_die(argv[1]); | ||
45 | |||
46 | } | ||