[X2Go-Commits] [x2goclient] 16/28: unixhelper.cpp: port from std::signal() to sigactio(). Handle errors.
git-admin at x2go.org
git-admin at x2go.org
Sat Mar 21 04:23:31 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 6f08b38e95bff8b800e9be8708bc878b71d5b501
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Mar 16 23:08:13 2015 +0100
unixhelper.cpp: port from std::signal() to sigactio(). Handle errors.
---
debian/changelog | 1 +
src/unixhelper.cpp | 33 ++++++++++++++++++++++++++-------
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4317636..7c0ec4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -264,6 +264,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
- unixhelper.cpp: kill process group on error.
- unixhelper.{cpp,h}: implement signal unblocking in
unixhelper::unix_cleanup(). Update documentation.
+ - unixhelper.cpp: port from std::signal() to sigactio(). Handle errors.
[ Fernando Pedemonte ]
* New upstream release (4.0.4.0):
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index 1877890..2b057ff 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -73,15 +73,34 @@ namespace unixhelper {
/* Anything here shall be unreachable. */
}
- /* Set up signal handler to ignore SIGTERM. */
- if (SIG_ERR == std::signal (SIGTERM, SIG_IGN)) {
- std::cerr << "Unable to ignore SIGTERM: " << std::strerror (errno) << std::endl;
- kill_pgroup (-1);
-
- /* Anything here shall be unreachable. */
+ {
+ struct sigaction sig_action;
+ sig_action.sa_handler = SIG_IGN;
+ sig_action.sa_mask = empty_set;
+ sig_action.sa_flags = SA_RESTART;
+
+ /* Set up signal handler to ignore SIGTERM. */
+ if (0 != sigaction (SIGTERM, &sig_action, NULL)) {
+ std::cerr << "Unable to ignore SIGTERM: " << std::strerror (errno) << std::endl;
+ kill_pgroup (-1);
+
+ /* Anything here shall be unreachable. */
+ }
}
- std::signal (SIGHUP, kill_pgroup);
+ {
+ struct sigaction sig_action;
+ sig_action.sa_handler = kill_pgroup;
+ sig_action.sa_mask = empty_set;
+ sig_action.sa_flags = SA_RESTART;
+
+ if (0 != sigaction (SIGHUP, &sig_action, NULL)) {
+ std::cerr << "Unable to set up signal handler for SIGHUP: " << std::strerror (errno) << std::endl;
+ kill_pgroup (-1);
+
+ /* Anything here shall be unreachable. */
+ }
+ }
/* Sleep forever... at least one second in each run. */
for (;;) {
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list