fiss

commit 00f7f1b052b1b0e9d8b9361b83cb21f8c94feee4
parent 06b87021ce8d280ca339fae8dac80870941c1da7
Author: Friedel Schön <[email protected]>
Date:   Mon, 22 May 2023 18:03:11 +0200

sigblock_all -> util.c

Diffstat:
M
include/util.h
 | 
1
+
M
man/fsvc.8
 | 
2
+-
M
man/zzz.8
 | 
2
+-
M
src/exec/finit.c
 | 
2
--
M
src/stage.c
 | 
13
-------------
M
src/util.c
 | 
15
+++++++++++++++

6 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/include/util.h b/include/util.h
@@ -22,3 +22,4 @@ unsigned int stat_mode(const char* format, ...);
 int fork_dup_cd_exec(int dir, const char* path, int fd0, int fd1, int fd2);
 
 int reclaim_console(void);
+void sigblock_all(int unblock);
diff --git a/man/fsvc.8 b/man/fsvc.8
@@ -23,7 +23,7 @@
 \fB\fCfsvc\fR \fB\fCswitch\fR [\fIoptions\fP] [\fB\fC\-\-reset\fR] <runlevel>
 .SH DESCRIPTION
 .PP
-\fB\fCfsvc\fR is a command line tool for controlling services on a FISS system. It provides various commands for starting, stopping, enabling, disabling, sending signals to, checking the status of, pausing, resuming, and switching the runlevel of services.
+\fB\fCfsvc\fR is a command line tool for controlling services on a fiss system. It provides various commands for starting, stopping, enabling, disabling, sending signals to, checking the status of, pausing, resuming, and switching the runlevel of services.
 .SH OPTIONS
 .PP
 The following options are available for every command:
diff --git a/man/zzz.8 b/man/zzz.8
@@ -7,7 +7,7 @@ zzz \- suspend or hibernate your system
 \fB\fCzzz [\-nSzZRH]\fR
 .SH DESCRIPTION
 .PP
-\fB\fCzzz\fR is a simple utility to hibernate or suspend your computer and part of the FISS\-system. It supports suspend/resume\-hooks.
+\fB\fCzzz\fR is a simple utility to hibernate or suspend your computer and part of the fiss\-system. It supports suspend/resume\-hooks.
 .PP
 \fB\fC\-n, \-\-noop\fR
 dry\-run, sleep for 5sec instead of actually running ACPI actions.
diff --git a/src/exec/finit.c b/src/exec/finit.c
@@ -13,8 +13,6 @@
 #include <unistd.h>
 
 
-void sigblock_all(bool unblock);
-
 int handle_initctl(int argc, const char** argv) {
 	if (argc != 2 || argv[1][1] != '\0' || (argv[1][0] != '0' && argv[1][0] != '6')) {
 		print_usage_exit(PROG_FINIT, 1);
diff --git a/src/stage.c b/src/stage.c
@@ -15,19 +15,6 @@ static const char* stage_exec[] = {
 };
 
 
-static void sigblock_all(bool unblock) {
-	sigset_t ss;
-	sigemptyset(&ss);
-	sigaddset(&ss, SIGALRM);
-	sigaddset(&ss, SIGCHLD);
-	sigaddset(&ss, SIGCONT);
-	sigaddset(&ss, SIGHUP);
-	sigaddset(&ss, SIGINT);
-	sigaddset(&ss, SIGPIPE);
-	sigaddset(&ss, SIGTERM);
-	sigprocmask(unblock, &ss, NULL);
-}
-
 void service_handle_stage(int stage) {
 	if (stage != 0 && stage != 2)
 		return;
diff --git a/src/util.c b/src/util.c
@@ -5,6 +5,7 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <string.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -90,3 +91,17 @@ int reclaim_console(void) {
 
 	return 0;
 }
+
+void sigblock_all(int unblock) {
+	sigset_t ss;
+	sigemptyset(&ss);
+	sigfillset(&ss);
+/*	sigaddset(&ss, SIGALRM);
+	sigaddset(&ss, SIGCHLD);
+	sigaddset(&ss, SIGCONT);
+	sigaddset(&ss, SIGHUP);
+	sigaddset(&ss, SIGINT);
+	sigaddset(&ss, SIGPIPE);
+	sigaddset(&ss, SIGTERM);*/
+	sigprocmask(unblock, &ss, NULL);
+}