mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-24 21:34:08 +03:00
util: split out signal-util.[ch] from util.[ch]
No functional changes.
This commit is contained in:
parent
1811232c4c
commit
24882e06c1
@ -785,6 +785,8 @@ libsystemd_shared_la_SOURCES = \
|
||||
src/shared/time-util.h \
|
||||
src/shared/locale-util.c \
|
||||
src/shared/locale-util.h \
|
||||
src/shared/signal-util.c \
|
||||
src/shared/signal-util.h \
|
||||
src/shared/mempool.c \
|
||||
src/shared/mempool.h \
|
||||
src/shared/hashmap.c \
|
||||
|
@ -22,15 +22,16 @@
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include "special.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "bus-kernel.h"
|
||||
#include "bus-internal.h"
|
||||
#include "bus-util.h"
|
||||
#include "service.h"
|
||||
#include "kdbus.h"
|
||||
#include "bus-policy.h"
|
||||
#include "service.h"
|
||||
#include "dbus-busname.h"
|
||||
#include "busname.h"
|
||||
#include "formats-util.h"
|
||||
|
||||
static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = {
|
||||
[BUSNAME_DEAD] = UNIT_INACTIVE,
|
||||
|
@ -19,9 +19,11 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "signal-util.h"
|
||||
#include "bus-util.h"
|
||||
|
||||
#include "kill.h"
|
||||
#include "dbus-kill.h"
|
||||
#include "bus-util.h"
|
||||
|
||||
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode);
|
||||
|
||||
|
@ -49,14 +49,13 @@
|
||||
#include <sys/apparmor.h>
|
||||
#endif
|
||||
|
||||
#include "sd-messages.h"
|
||||
#include "rm-rf.h"
|
||||
#include "execute.h"
|
||||
#include "strv.h"
|
||||
#include "macro.h"
|
||||
#include "capability.h"
|
||||
#include "util.h"
|
||||
#include "log.h"
|
||||
#include "sd-messages.h"
|
||||
#include "ioprio.h"
|
||||
#include "securebits.h"
|
||||
#include "namespace.h"
|
||||
@ -79,6 +78,7 @@
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#ifdef HAVE_APPARMOR
|
||||
#include "apparmor-util.h"
|
||||
@ -88,6 +88,8 @@
|
||||
#include "seccomp-util.h"
|
||||
#endif
|
||||
|
||||
#include "execute.h"
|
||||
|
||||
#define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
|
||||
#define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
|
||||
|
||||
|
@ -19,9 +19,9 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
|
||||
#include "kill.h"
|
||||
#include "util.h"
|
||||
#include "signal-util.h"
|
||||
#include "kill.h"
|
||||
|
||||
void kill_context_init(KillContext *c) {
|
||||
assert(c);
|
||||
|
@ -52,6 +52,7 @@
|
||||
#include "errno-list.h"
|
||||
#include "af-list.h"
|
||||
#include "cap-list.h"
|
||||
#include "signal-util.h"
|
||||
#include "bus-internal.h"
|
||||
|
||||
#ifdef HAVE_SECCOMP
|
||||
|
@ -60,6 +60,10 @@
|
||||
#include "bus-error.h"
|
||||
#include "bus-util.h"
|
||||
#include "selinux-util.h"
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "manager.h"
|
||||
#include "dbus-manager.h"
|
||||
#include "load-fragment.h"
|
||||
@ -72,9 +76,6 @@
|
||||
#include "ima-setup.h"
|
||||
#include "smack-setup.h"
|
||||
#include "kmod-setup.h"
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
|
||||
static enum {
|
||||
ACTION_RUN,
|
||||
|
@ -40,8 +40,6 @@
|
||||
#include "sd-daemon.h"
|
||||
#include "sd-messages.h"
|
||||
|
||||
#include "manager.h"
|
||||
#include "transaction.h"
|
||||
#include "hashmap.h"
|
||||
#include "macro.h"
|
||||
#include "strv.h"
|
||||
@ -65,14 +63,17 @@
|
||||
#include "bus-common-errors.h"
|
||||
#include "bus-error.h"
|
||||
#include "bus-util.h"
|
||||
#include "dbus.h"
|
||||
#include "dbus-unit.h"
|
||||
#include "dbus-job.h"
|
||||
#include "dbus-manager.h"
|
||||
#include "bus-kernel.h"
|
||||
#include "time-util.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "dbus.h"
|
||||
#include "dbus-unit.h"
|
||||
#include "dbus-job.h"
|
||||
#include "dbus-manager.h"
|
||||
#include "manager.h"
|
||||
#include "transaction.h"
|
||||
|
||||
/* Initial delay and the interval for printing status messages about running jobs */
|
||||
#define JOBS_IN_PROGRESS_WAIT_USEC (5*USEC_PER_SEC)
|
||||
|
@ -47,6 +47,7 @@
|
||||
#include "bus-kernel.h"
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
|
||||
[SERVICE_DEAD] = UNIT_INACTIVE,
|
||||
|
@ -47,8 +47,9 @@
|
||||
#include "selinux-util.h"
|
||||
#include "dbus-socket.h"
|
||||
#include "unit.h"
|
||||
#include "socket.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "socket.h"
|
||||
|
||||
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
|
||||
[SOCKET_DEAD] = UNIT_INACTIVE,
|
||||
|
@ -34,6 +34,7 @@
|
||||
|
||||
#include "util.h"
|
||||
#include "process-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "special.h"
|
||||
#include "bus-util.h"
|
||||
#include "bus-error.h"
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
#include "sd-event.h"
|
||||
#include "event-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "verbs.h"
|
||||
#include "build.h"
|
||||
#include "machine-image.h"
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "util.h"
|
||||
#include "btrfs-util.h"
|
||||
#include "capability.h"
|
||||
#include "signal-util.h"
|
||||
#include "import-common.h"
|
||||
|
||||
int import_make_read_only_fd(int fd) {
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include "event-util.h"
|
||||
#include "verbs.h"
|
||||
#include "build.h"
|
||||
#include "signal-util.h"
|
||||
#include "machine-image.h"
|
||||
#include "import-util.h"
|
||||
#include "import-tar.h"
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include "path-util.h"
|
||||
#include "import-util.h"
|
||||
#include "process-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
typedef struct Transfer Transfer;
|
||||
typedef struct Manager Manager;
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include "pull-job.h"
|
||||
#include "pull-common.h"
|
||||
#include "process-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#define FILENAME_ESCAPE "/.#\"\'"
|
||||
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include "event-util.h"
|
||||
#include "verbs.h"
|
||||
#include "build.h"
|
||||
#include "signal-util.h"
|
||||
#include "machine-image.h"
|
||||
#include "import-util.h"
|
||||
#include "pull-tar.h"
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include <getopt.h>
|
||||
|
||||
#include "sd-daemon.h"
|
||||
#include "signal-util.h"
|
||||
#include "journal-file.h"
|
||||
#include "journald-native.h"
|
||||
#include "socket-util.h"
|
||||
|
@ -33,8 +33,9 @@
|
||||
#include "mkdir.h"
|
||||
#include "conf-parser.h"
|
||||
#include "sigbus.h"
|
||||
#include "journal-upload.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "journal-upload.h"
|
||||
|
||||
#define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"
|
||||
#define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem"
|
||||
|
@ -39,6 +39,7 @@
|
||||
#include "sigbus.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static enum {
|
||||
ACTION_NONE,
|
||||
|
@ -25,6 +25,10 @@
|
||||
#include <sys/statvfs.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
#include <selinux/selinux.h>
|
||||
#endif
|
||||
|
||||
#include <libudev.h>
|
||||
|
||||
#include "sd-journal.h"
|
||||
@ -43,6 +47,7 @@
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "hostname-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "journal-internal.h"
|
||||
#include "journal-vacuum.h"
|
||||
#include "journal-authenticate.h"
|
||||
@ -54,10 +59,6 @@
|
||||
#include "journald-audit.h"
|
||||
#include "journald-server.h"
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
#include <selinux/selinux.h>
|
||||
#endif
|
||||
|
||||
#define USER_JOURNALS_MAX 1024
|
||||
|
||||
#define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
|
||||
|
@ -24,12 +24,13 @@
|
||||
#include <unistd.h>
|
||||
#include <poll.h>
|
||||
|
||||
#include "sd-daemon.h"
|
||||
#include "util.h"
|
||||
#include "macro.h"
|
||||
#include "missing.h"
|
||||
#include "utf8.h"
|
||||
#include "sd-daemon.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#include "sd-bus.h"
|
||||
#include "bus-socket.h"
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include "path-util.h"
|
||||
#include "missing.h"
|
||||
#include "set.h"
|
||||
#include "signal-util.h"
|
||||
#include "unit-name.h"
|
||||
|
||||
#include "sd-bus.h"
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "missing.h"
|
||||
#include "set.h"
|
||||
#include "list.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#include "sd-event.h"
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "log.h"
|
||||
#include "util.h"
|
||||
#include "macro.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static int prepare_handler(sd_event_source *s, void *userdata) {
|
||||
log_info("preparing %c", PTR_TO_INT(userdata));
|
||||
|
@ -43,6 +43,7 @@
|
||||
#include "verbs.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static char **arg_property = NULL;
|
||||
static bool arg_all = false;
|
||||
|
@ -30,9 +30,10 @@
|
||||
#include "conf-parser.h"
|
||||
#include "bus-util.h"
|
||||
#include "bus-error.h"
|
||||
#include "logind.h"
|
||||
#include "udev-util.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "logind.h"
|
||||
|
||||
static void manager_free(Manager *m);
|
||||
|
||||
|
@ -54,6 +54,7 @@
|
||||
#include "import-util.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static char **arg_property = NULL;
|
||||
static bool arg_all = false;
|
||||
|
@ -28,9 +28,10 @@
|
||||
#include "bus-util.h"
|
||||
#include "bus-error.h"
|
||||
#include "label.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "machine-image.h"
|
||||
#include "machined.h"
|
||||
#include "formats-util.h"
|
||||
|
||||
Manager *manager_new(void) {
|
||||
Manager *m;
|
||||
|
@ -21,11 +21,10 @@
|
||||
#include <getopt.h>
|
||||
|
||||
#include "sd-daemon.h"
|
||||
|
||||
#include "networkd-wait-online.h"
|
||||
|
||||
#include "strv.h"
|
||||
#include "build.h"
|
||||
#include "signal-util.h"
|
||||
#include "networkd-wait-online.h"
|
||||
|
||||
static bool arg_quiet = false;
|
||||
static usec_t arg_timeout = 120 * USEC_PER_SEC;
|
||||
|
@ -19,9 +19,9 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "capability.h"
|
||||
#include "sd-daemon.h"
|
||||
|
||||
#include "capability.h"
|
||||
#include "signal-util.h"
|
||||
#include "networkd.h"
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
|
@ -96,6 +96,7 @@
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "hostname-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#ifdef HAVE_SECCOMP
|
||||
#include "seccomp-util.h"
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include "log.h"
|
||||
#include "util.h"
|
||||
#include "path-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "mount-setup.h"
|
||||
#include "exit-status.h"
|
||||
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include "mkdir.h"
|
||||
#include "capability.h"
|
||||
#include "selinux-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#include "resolved-manager.h"
|
||||
#include "resolved-conf.h"
|
||||
|
@ -35,6 +35,7 @@
|
||||
#include "calendarspec.h"
|
||||
#include "ptyfwd.h"
|
||||
#include "formats-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static bool arg_scope = false;
|
||||
static bool arg_remain_after_exit = false;
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "strv.h"
|
||||
#include "random-util.h"
|
||||
#include "terminal-util.h"
|
||||
|
||||
#include "signal-util.h"
|
||||
#include "ask-password-api.h"
|
||||
|
||||
static void backspace_chars(int ttyfd, size_t p) {
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#define SNDBUF_SIZE (8*1024*1024)
|
||||
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include "mkdir.h"
|
||||
#include "btrfs-util.h"
|
||||
#include "path-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "machine-pool.h"
|
||||
|
||||
#define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
|
||||
|
@ -28,10 +28,11 @@
|
||||
#include <signal.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "process-util.h"
|
||||
#include "fileio.h"
|
||||
#include "util.h"
|
||||
#include "log.h"
|
||||
#include "signal-util.h"
|
||||
#include "process-util.h"
|
||||
|
||||
int get_process_state(pid_t pid) {
|
||||
const char *p;
|
||||
|
@ -57,9 +57,10 @@
|
||||
|
||||
#include "barrier.h"
|
||||
#include "macro.h"
|
||||
#include "pty.h"
|
||||
#include "ring.h"
|
||||
#include "util.h"
|
||||
#include "signal-util.h"
|
||||
#include "pty.h"
|
||||
|
||||
#define PTY_BUFSIZE 4096
|
||||
|
||||
|
228
src/shared/signal-util.c
Normal file
228
src/shared/signal-util.c
Normal file
@ -0,0 +1,228 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2015 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
int reset_all_signal_handlers(void) {
|
||||
int sig, r = 0;
|
||||
|
||||
for (sig = 1; sig < _NSIG; sig++) {
|
||||
static const struct sigaction sa = {
|
||||
.sa_handler = SIG_DFL,
|
||||
.sa_flags = SA_RESTART,
|
||||
};
|
||||
|
||||
/* These two cannot be caught... */
|
||||
if (sig == SIGKILL || sig == SIGSTOP)
|
||||
continue;
|
||||
|
||||
/* On Linux the first two RT signals are reserved by
|
||||
* glibc, and sigaction() will return EINVAL for them. */
|
||||
if ((sigaction(sig, &sa, NULL) < 0))
|
||||
if (errno != EINVAL && r == 0)
|
||||
r = -errno;
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int reset_signal_mask(void) {
|
||||
sigset_t ss;
|
||||
|
||||
if (sigemptyset(&ss) < 0)
|
||||
return -errno;
|
||||
|
||||
if (sigprocmask(SIG_SETMASK, &ss, NULL) < 0)
|
||||
return -errno;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sigaction_many(const struct sigaction *sa, ...) {
|
||||
va_list ap;
|
||||
int r = 0, sig;
|
||||
|
||||
va_start(ap, sa);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
if (sigaction(sig, sa, NULL) < 0)
|
||||
r = -errno;
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int ignore_signals(int sig, ...) {
|
||||
static const struct sigaction sa = {
|
||||
.sa_handler = SIG_IGN,
|
||||
.sa_flags = SA_RESTART,
|
||||
};
|
||||
va_list ap;
|
||||
int r = 0;
|
||||
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
|
||||
va_start(ap, sig);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int default_signals(int sig, ...) {
|
||||
static const struct sigaction sa = {
|
||||
.sa_handler = SIG_DFL,
|
||||
.sa_flags = SA_RESTART,
|
||||
};
|
||||
va_list ap;
|
||||
int r = 0;
|
||||
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
|
||||
va_start(ap, sig);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
void sigset_add_many(sigset_t *ss, ...) {
|
||||
va_list ap;
|
||||
int sig;
|
||||
|
||||
assert(ss);
|
||||
|
||||
va_start(ap, ss);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
assert_se(sigaddset(ss, sig) == 0);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
int sigprocmask_many(int how, ...) {
|
||||
va_list ap;
|
||||
sigset_t ss;
|
||||
int sig;
|
||||
|
||||
assert_se(sigemptyset(&ss) == 0);
|
||||
|
||||
va_start(ap, how);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
assert_se(sigaddset(&ss, sig) == 0);
|
||||
va_end(ap);
|
||||
|
||||
if (sigprocmask(how, &ss, NULL) < 0)
|
||||
return -errno;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char *const __signal_table[] = {
|
||||
[SIGHUP] = "HUP",
|
||||
[SIGINT] = "INT",
|
||||
[SIGQUIT] = "QUIT",
|
||||
[SIGILL] = "ILL",
|
||||
[SIGTRAP] = "TRAP",
|
||||
[SIGABRT] = "ABRT",
|
||||
[SIGBUS] = "BUS",
|
||||
[SIGFPE] = "FPE",
|
||||
[SIGKILL] = "KILL",
|
||||
[SIGUSR1] = "USR1",
|
||||
[SIGSEGV] = "SEGV",
|
||||
[SIGUSR2] = "USR2",
|
||||
[SIGPIPE] = "PIPE",
|
||||
[SIGALRM] = "ALRM",
|
||||
[SIGTERM] = "TERM",
|
||||
#ifdef SIGSTKFLT
|
||||
[SIGSTKFLT] = "STKFLT", /* Linux on SPARC doesn't know SIGSTKFLT */
|
||||
#endif
|
||||
[SIGCHLD] = "CHLD",
|
||||
[SIGCONT] = "CONT",
|
||||
[SIGSTOP] = "STOP",
|
||||
[SIGTSTP] = "TSTP",
|
||||
[SIGTTIN] = "TTIN",
|
||||
[SIGTTOU] = "TTOU",
|
||||
[SIGURG] = "URG",
|
||||
[SIGXCPU] = "XCPU",
|
||||
[SIGXFSZ] = "XFSZ",
|
||||
[SIGVTALRM] = "VTALRM",
|
||||
[SIGPROF] = "PROF",
|
||||
[SIGWINCH] = "WINCH",
|
||||
[SIGIO] = "IO",
|
||||
[SIGPWR] = "PWR",
|
||||
[SIGSYS] = "SYS"
|
||||
};
|
||||
|
||||
DEFINE_PRIVATE_STRING_TABLE_LOOKUP(__signal, int);
|
||||
|
||||
const char *signal_to_string(int signo) {
|
||||
static thread_local char buf[sizeof("RTMIN+")-1 + DECIMAL_STR_MAX(int) + 1];
|
||||
const char *name;
|
||||
|
||||
name = __signal_to_string(signo);
|
||||
if (name)
|
||||
return name;
|
||||
|
||||
if (signo >= SIGRTMIN && signo <= SIGRTMAX)
|
||||
snprintf(buf, sizeof(buf), "RTMIN+%d", signo - SIGRTMIN);
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%d", signo);
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
int signal_from_string(const char *s) {
|
||||
int signo;
|
||||
int offset = 0;
|
||||
unsigned u;
|
||||
|
||||
signo = __signal_from_string(s);
|
||||
if (signo > 0)
|
||||
return signo;
|
||||
|
||||
if (startswith(s, "RTMIN+")) {
|
||||
s += 6;
|
||||
offset = SIGRTMIN;
|
||||
}
|
||||
if (safe_atou(s, &u) >= 0) {
|
||||
signo = (int) u + offset;
|
||||
if (signo > 0 && signo < _NSIG)
|
||||
return signo;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
int signal_from_string_try_harder(const char *s) {
|
||||
int signo;
|
||||
assert(s);
|
||||
|
||||
signo = signal_from_string(s);
|
||||
if (signo <= 0)
|
||||
if (startswith(s, "SIG"))
|
||||
return signal_from_string(s+3);
|
||||
|
||||
return signo;
|
||||
}
|
41
src/shared/signal-util.h
Normal file
41
src/shared/signal-util.h
Normal file
@ -0,0 +1,41 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2010-2015 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#include "macro.h"
|
||||
|
||||
int reset_all_signal_handlers(void);
|
||||
int reset_signal_mask(void);
|
||||
|
||||
int ignore_signals(int sig, ...);
|
||||
int default_signals(int sig, ...);
|
||||
int sigaction_many(const struct sigaction *sa, ...);
|
||||
|
||||
void sigset_add_many(sigset_t *ss, ...);
|
||||
int sigprocmask_many(int how, ...);
|
||||
|
||||
const char *signal_to_string(int i) _const_;
|
||||
int signal_from_string(const char *s) _pure_;
|
||||
|
||||
int signal_from_string_try_harder(const char *s);
|
@ -93,6 +93,7 @@
|
||||
#include "random-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "hostname-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
/* Put this test here for a lack of better place */
|
||||
assert_cc(EAGAIN == EWOULDBLOCK);
|
||||
@ -771,41 +772,6 @@ int readlink_and_canonicalize(const char *p, char **r) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int reset_all_signal_handlers(void) {
|
||||
int sig, r = 0;
|
||||
|
||||
for (sig = 1; sig < _NSIG; sig++) {
|
||||
struct sigaction sa = {
|
||||
.sa_handler = SIG_DFL,
|
||||
.sa_flags = SA_RESTART,
|
||||
};
|
||||
|
||||
/* These two cannot be caught... */
|
||||
if (sig == SIGKILL || sig == SIGSTOP)
|
||||
continue;
|
||||
|
||||
/* On Linux the first two RT signals are reserved by
|
||||
* glibc, and sigaction() will return EINVAL for them. */
|
||||
if ((sigaction(sig, &sa, NULL) < 0))
|
||||
if (errno != EINVAL && r == 0)
|
||||
r = -errno;
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int reset_signal_mask(void) {
|
||||
sigset_t ss;
|
||||
|
||||
if (sigemptyset(&ss) < 0)
|
||||
return -errno;
|
||||
|
||||
if (sigprocmask(SIG_SETMASK, &ss, NULL) < 0)
|
||||
return -errno;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *strstrip(char *s) {
|
||||
char *e;
|
||||
|
||||
@ -1561,59 +1527,6 @@ int flush_fd(int fd) {
|
||||
}
|
||||
}
|
||||
|
||||
int sigaction_many(const struct sigaction *sa, ...) {
|
||||
va_list ap;
|
||||
int r = 0, sig;
|
||||
|
||||
va_start(ap, sa);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
if (sigaction(sig, sa, NULL) < 0)
|
||||
r = -errno;
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int ignore_signals(int sig, ...) {
|
||||
struct sigaction sa = {
|
||||
.sa_handler = SIG_IGN,
|
||||
.sa_flags = SA_RESTART,
|
||||
};
|
||||
va_list ap;
|
||||
int r = 0;
|
||||
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
|
||||
va_start(ap, sig);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int default_signals(int sig, ...) {
|
||||
struct sigaction sa = {
|
||||
.sa_handler = SIG_DFL,
|
||||
.sa_flags = SA_RESTART,
|
||||
};
|
||||
va_list ap;
|
||||
int r = 0;
|
||||
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
|
||||
va_start(ap, sig);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
if (sigaction(sig, &sa, NULL) < 0)
|
||||
r = -errno;
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
void safe_close_pair(int p[]) {
|
||||
assert(p);
|
||||
|
||||
@ -1927,35 +1840,6 @@ void rename_process(const char name[8]) {
|
||||
}
|
||||
}
|
||||
|
||||
void sigset_add_many(sigset_t *ss, ...) {
|
||||
va_list ap;
|
||||
int sig;
|
||||
|
||||
assert(ss);
|
||||
|
||||
va_start(ap, ss);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
assert_se(sigaddset(ss, sig) == 0);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
int sigprocmask_many(int how, ...) {
|
||||
va_list ap;
|
||||
sigset_t ss;
|
||||
int sig;
|
||||
|
||||
assert_se(sigemptyset(&ss) == 0);
|
||||
|
||||
va_start(ap, how);
|
||||
while ((sig = va_arg(ap, int)) > 0)
|
||||
assert_se(sigaddset(&ss, sig) == 0);
|
||||
va_end(ap);
|
||||
|
||||
if (sigprocmask(how, &ss, NULL) < 0)
|
||||
return -errno;
|
||||
|
||||
return 0;
|
||||
}
|
||||
char *lookup_uid(uid_t uid) {
|
||||
long bufsize;
|
||||
char *name;
|
||||
@ -2344,18 +2228,6 @@ DIR *xopendirat(int fd, const char *name, int flags) {
|
||||
return d;
|
||||
}
|
||||
|
||||
int signal_from_string_try_harder(const char *s) {
|
||||
int signo;
|
||||
assert(s);
|
||||
|
||||
signo = signal_from_string(s);
|
||||
if (signo <= 0)
|
||||
if (startswith(s, "SIG"))
|
||||
return signal_from_string(s+3);
|
||||
|
||||
return signo;
|
||||
}
|
||||
|
||||
static char *tag_to_udev_node(const char *tagvalue, const char *by) {
|
||||
_cleanup_free_ char *t = NULL, *u = NULL;
|
||||
size_t enc_len;
|
||||
@ -3312,81 +3184,6 @@ static const char* const ip_tos_table[] = {
|
||||
|
||||
DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ip_tos, int, 0xff);
|
||||
|
||||
static const char *const __signal_table[] = {
|
||||
[SIGHUP] = "HUP",
|
||||
[SIGINT] = "INT",
|
||||
[SIGQUIT] = "QUIT",
|
||||
[SIGILL] = "ILL",
|
||||
[SIGTRAP] = "TRAP",
|
||||
[SIGABRT] = "ABRT",
|
||||
[SIGBUS] = "BUS",
|
||||
[SIGFPE] = "FPE",
|
||||
[SIGKILL] = "KILL",
|
||||
[SIGUSR1] = "USR1",
|
||||
[SIGSEGV] = "SEGV",
|
||||
[SIGUSR2] = "USR2",
|
||||
[SIGPIPE] = "PIPE",
|
||||
[SIGALRM] = "ALRM",
|
||||
[SIGTERM] = "TERM",
|
||||
#ifdef SIGSTKFLT
|
||||
[SIGSTKFLT] = "STKFLT", /* Linux on SPARC doesn't know SIGSTKFLT */
|
||||
#endif
|
||||
[SIGCHLD] = "CHLD",
|
||||
[SIGCONT] = "CONT",
|
||||
[SIGSTOP] = "STOP",
|
||||
[SIGTSTP] = "TSTP",
|
||||
[SIGTTIN] = "TTIN",
|
||||
[SIGTTOU] = "TTOU",
|
||||
[SIGURG] = "URG",
|
||||
[SIGXCPU] = "XCPU",
|
||||
[SIGXFSZ] = "XFSZ",
|
||||
[SIGVTALRM] = "VTALRM",
|
||||
[SIGPROF] = "PROF",
|
||||
[SIGWINCH] = "WINCH",
|
||||
[SIGIO] = "IO",
|
||||
[SIGPWR] = "PWR",
|
||||
[SIGSYS] = "SYS"
|
||||
};
|
||||
|
||||
DEFINE_PRIVATE_STRING_TABLE_LOOKUP(__signal, int);
|
||||
|
||||
const char *signal_to_string(int signo) {
|
||||
static thread_local char buf[sizeof("RTMIN+")-1 + DECIMAL_STR_MAX(int) + 1];
|
||||
const char *name;
|
||||
|
||||
name = __signal_to_string(signo);
|
||||
if (name)
|
||||
return name;
|
||||
|
||||
if (signo >= SIGRTMIN && signo <= SIGRTMAX)
|
||||
snprintf(buf, sizeof(buf), "RTMIN+%d", signo - SIGRTMIN);
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%d", signo);
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
int signal_from_string(const char *s) {
|
||||
int signo;
|
||||
int offset = 0;
|
||||
unsigned u;
|
||||
|
||||
signo = __signal_from_string(s);
|
||||
if (signo > 0)
|
||||
return signo;
|
||||
|
||||
if (startswith(s, "RTMIN+")) {
|
||||
s += 6;
|
||||
offset = SIGRTMIN;
|
||||
}
|
||||
if (safe_atou(s, &u) >= 0) {
|
||||
signo = (int) u + offset;
|
||||
if (signo > 0 && signo < _NSIG)
|
||||
return signo;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
bool kexec_loaded(void) {
|
||||
bool loaded = false;
|
||||
char *s;
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <sched.h>
|
||||
#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
@ -227,9 +226,6 @@ int readlink_value(const char *p, char **ret);
|
||||
int readlink_and_make_absolute(const char *p, char **r);
|
||||
int readlink_and_canonicalize(const char *p, char **r);
|
||||
|
||||
int reset_all_signal_handlers(void);
|
||||
int reset_signal_mask(void);
|
||||
|
||||
char *strstrip(char *s);
|
||||
char *delete_chars(char *s, const char *bad);
|
||||
char *truncate_nl(char *s);
|
||||
@ -334,10 +330,6 @@ bool fstype_is_network(const char *fstype);
|
||||
|
||||
int flush_fd(int fd);
|
||||
|
||||
int ignore_signals(int sig, ...);
|
||||
int default_signals(int sig, ...);
|
||||
int sigaction_many(const struct sigaction *sa, ...);
|
||||
|
||||
int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
|
||||
|
||||
ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);
|
||||
@ -349,9 +341,6 @@ bool is_device_path(const char *path);
|
||||
int dir_is_empty(const char *path);
|
||||
char* dirname_malloc(const char *path);
|
||||
|
||||
void sigset_add_many(sigset_t *ss, ...);
|
||||
int sigprocmask_many(int how, ...);
|
||||
|
||||
char* lookup_uid(uid_t uid);
|
||||
char* getlogname_malloc(void);
|
||||
char* getusername_malloc(void);
|
||||
@ -465,11 +454,6 @@ int rlimit_from_string(const char *s) _pure_;
|
||||
int ip_tos_to_string_alloc(int i, char **s);
|
||||
int ip_tos_from_string(const char *s);
|
||||
|
||||
const char *signal_to_string(int i) _const_;
|
||||
int signal_from_string(const char *s) _pure_;
|
||||
|
||||
int signal_from_string_try_harder(const char *s);
|
||||
|
||||
extern int saved_argc;
|
||||
extern char **saved_argv;
|
||||
|
||||
|
@ -72,6 +72,7 @@
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "hostname-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static char **arg_types = NULL;
|
||||
static char **arg_states = NULL;
|
||||
|
@ -27,6 +27,7 @@
|
||||
|
||||
#include "pty.h"
|
||||
#include "util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static const char sndmsg[] = "message\n";
|
||||
static const char rcvmsg[] = "message\r\n";
|
||||
|
@ -39,6 +39,7 @@
|
||||
#include "virt.h"
|
||||
#include "process-util.h"
|
||||
#include "hostname-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static void test_streq_ptr(void) {
|
||||
assert_se(streq_ptr(NULL, NULL));
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include "capability.h"
|
||||
#include "clock-util.h"
|
||||
#include "network-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
#include "timesyncd-manager.h"
|
||||
#include "timesyncd-conf.h"
|
||||
|
@ -44,6 +44,7 @@
|
||||
#include "def.h"
|
||||
#include "process-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static enum {
|
||||
ACTION_LIST,
|
||||
|
@ -30,11 +30,12 @@
|
||||
#include <sys/wait.h>
|
||||
#include <sys/signalfd.h>
|
||||
|
||||
#include "udev.h"
|
||||
#include "rtnl-util.h"
|
||||
#include "event-util.h"
|
||||
#include "formats-util.h"
|
||||
#include "process-util.h"
|
||||
#include "signal-util.h"
|
||||
#include "udev.h"
|
||||
|
||||
typedef struct Spawn {
|
||||
const char *cmd;
|
||||
|
Loading…
Reference in New Issue
Block a user