diff options
| -rw-r--r-- | lib/lib.c | 12 | ||||
| -rw-r--r-- | lib/lib.h | 1 | ||||
| -rw-r--r-- | main.c | 1 | ||||
| -rw-r--r-- | toys.h | 3 |
4 files changed, 17 insertions, 0 deletions
@@ -614,12 +614,24 @@ static struct signame signames[] = { // not in posix: SIGNIFY(STKFLT), SIGNIFY(WINCH), SIGNIFY(IO), SIGNIFY(PWR) // obsolete: SIGNIFY(PROF) SIGNIFY(POLL) +// Handler that sets toys.signal, and writes to toys.signalfd if set +void generic_signal(int sig) +{ + if (toys.signalfd) { + char c = sig; + + writeall(toys.signalfd, &c, 1); + } + toys.signal = sig; +} + // Install the same handler on every signal that defaults to killing the process void sigatexit(void *handler) { int i; for (i=0; signames[i].num != SIGCHLD; i++) signal(signames[i].num, handler); } + // Convert name to signal number. If name == NULL print names. int sig_to_num(char *pidstr) { @@ -174,6 +174,7 @@ struct mtab_list *xgetmountlist(char *path); // signal +void generic_signal(int signal); void sigatexit(void *handler); int sig_to_num(char *pidstr); char *num_to_sig(int sig); @@ -80,6 +80,7 @@ static void toy_singleinit(struct toy_list *which, char *argv[]) } toys.old_umask = umask(0); if (!(which->flags & TOYFLAG_UMASK)) umask(toys.old_umask); + toys.signalfd--; } // Setup toybox global state for this command. @@ -23,6 +23,7 @@ #include <regex.h> #include <sched.h> #include <setjmp.h> +#include <signal.h> #include <stdarg.h> #include <stddef.h> #include <stdint.h> @@ -125,6 +126,8 @@ extern struct toy_context { int exithelp; // Should error_exit print a usage message first? int old_umask; // Old umask preserved by TOYFLAG_UMASK int toycount; // Total number of commands in this build + int signal; // generic_signal() records what signal it saw here + int signalfd; // and writes signal to this fd, if set // This is at the end so toy_init() doesn't zero it. jmp_buf *rebound; // longjmp here instead of exit when do_rebound set |