[X2Go-Commits] [x2goclient] 18/217: x2goclient.cpp: don't start the UNIX cleanup helper process right after forking.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 0b89c42d6051230f84a74b4e2d39a0b061a828c4
Author: Mihai Moldovan
Date: Wed Mar 18 01:04:33 2015 +0100
x2goclient.cpp: don't start the UNIX cleanup helper process right after
forking.
Introduce a new command line option --unixhelper and re-execute the main
binary with this new option to indicate that the UNIX cleanup helper
tool is requested. It is necessary to call exec() after fork on
virtually all operating system, especially on OS X.
---
debian/changelog |5
src/x2goclient.cpp | 65
2 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 49d9d4f..025138c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,11 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
and we certainly do not need to fork to force it to succeed. Whether we
are a process group leader already or become one doesn't matter, if the
end result is that we are process group leader.
+- x2goclient.cpp: don't start the UNIX cleanup helper process right after
+ forking, but introduce a new command line option --unixhelper and
+ re-execute the main binary with this new option to indicate that the
+ UNIX cleanup helper tool is requested. It is necessary to call exec()
+ after fork on virtually all operating system, especially on OS X.
-- X2Go Release Manager Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index ad613fb..3f11d55 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -22,6 +22,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include "unixhelper.h"
#include "ongetpass.h"
@@ -38,7 +42,28 @@ int fork_helper (int argc, char **argv) {
/* Child. */
if (0 == tmp_pid) {
/* Starting unixhelper. */
-return (unixhelper::unix_cleanup ());
+std::vector new_argv;
+new_argv.push (std::string (argv[0]));
+new_argv.push ("--unixhelper");
+
+std::vector new_argv_c_str;
+for (const_iterator it = new_argv.begin (); it != new_argv.end (); ++it) {
+ new_argv_c_str.push ((*it).c_str ());
+}
+new_argv_c_str.push ("");
+
+if (0 != execv (new_argv_c_str.data (), new_argv_c_str.data ())) {
+ std::cerr << "Failed to re-execute process as UNIX cleanup helper tool:
" << std::strerror (errno) << "\n"
+<< "Terminating and killing parent." << "\n"
+<< "Please report a bug, refer to this documentation:
http://wiki.x2go.org/doku.php/wiki:bugs"; << std::endl;
+
+ pid_t parent_pid = getppid ();
+ if (0 != kill (parent_pid, SIGTERM)) {
+std::cerr << "Failed to kill parent process: " << std::strerror
(errno) << std::endl;
+ }
+
+ std::exit (EXIT_FAILURE);
+}
/* Anything here shall be unreachable. */
}
@@ -59,15 +84,35 @@ int fork_helper (int argc, char **argv) {
int main (int argc, char **argv) {
#ifdef Q_OS_UNIX
- /*
- * setsid() may succeed and we become a session and process
- * group leader, or it may fail indicating that we already
- * are a process group leader. Either way is fine.
- */
- setsid ();
-
- /* We should be process group leader by now. */
- return (fork_helper (argc, argv));
+ /* Scan program arguments for --unixhelper flag. */
+ bool unix_helper_request = 0;
+ for (int i = 0; i < argc; ++i) {
+std::string cur_arg (argv[i]);
+
+/* Make the current argument lowercase. */
+std::transform (cur_arg.begin (), cur_arg.end (), cur_arg.begin (),
std::tolower);
+
+if ((!cur_arg.empty ()) && (cur_arg.compare ("--unixhelper"))) {
+ unix_helper_request = 1;
+ break;
+}
+ }
+
+ if (unix_helper_request) {
+/* We were instructed to start as the UNIX cleanup helper tool. */
+return (unixhelper::unix_cleanup ());
+ }
+ else {
+/*
+ * setsid() may succeed and we become a session and process
+ * group leader, or it may fail indicating that we already
+ * are a process group leader. Either way is fine.
+ */
+setsid ();
+
+/* We should be process group leader by now. */
+return (fork_helper (argc, argv));
+ }
#else /* defined (Q_OS_UNIX) */
return (wrap_x2go_main (argc, argv));
#endif /* defined (Q_OS_UNIX) */
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [x2goclient] 18/217: x2goclient.cpp: don't start the UNIX cleanup helper process right after forking.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 9a760c46fad9c072f5bf38104223bf64220bff37
Author: Mihai Moldovan
Date: Wed Mar 18 01:04:33 2015 +0100
x2goclient.cpp: don't start the UNIX cleanup helper process right after
forking.
Introduce a new command line option --unixhelper and re-execute the main
binary with this new option to indicate that the UNIX cleanup helper
tool is requested. It is necessary to call exec() after fork on
virtually all operating system, especially on OS X.
---
debian/changelog |5
src/x2goclient.cpp | 65
2 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ad2deaf..b5ea29e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,11 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
and we certainly do not need to fork to force it to succeed. Whether we
are a process group leader already or become one doesn't matter, if the
end result is that we are process group leader.
+- x2goclient.cpp: don't start the UNIX cleanup helper process right after
+ forking, but introduce a new command line option --unixhelper and
+ re-execute the main binary with this new option to indicate that the
+ UNIX cleanup helper tool is requested. It is necessary to call exec()
+ after fork on virtually all operating system, especially on OS X.
* debian/control:
- Maintainer change in package: X2Go Developers .
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index ad613fb..3f11d55 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -22,6 +22,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include "unixhelper.h"
#include "ongetpass.h"
@@ -38,7 +42,28 @@ int fork_helper (int argc, char **argv) {
/* Child. */
if (0 == tmp_pid) {
/* Starting unixhelper. */
-return (unixhelper::unix_cleanup ());
+std::vector new_argv;
+new_argv.push (std::string (argv[0]));
+new_argv.push ("--unixhelper");
+
+std::vector new_argv_c_str;
+for (const_iterator it = new_argv.begin (); it != new_argv.end (); ++it) {
+ new_argv_c_str.push ((*it).c_str ());
+}
+new_argv_c_str.push ("");
+
+if (0 != execv (new_argv_c_str.data (), new_argv_c_str.data ())) {
+ std::cerr << "Failed to re-execute process as UNIX cleanup helper tool:
" << std::strerror (errno) << "\n"
+<< "Terminating and killing parent." << "\n"
+<< "Please report a bug, refer to this documentation:
http://wiki.x2go.org/doku.php/wiki:bugs"; << std::endl;
+
+ pid_t parent_pid = getppid ();
+ if (0 != kill (parent_pid, SIGTERM)) {
+std::cerr << "Failed to kill parent process: " << std::strerror
(errno) << std::endl;
+ }
+
+ std::exit (EXIT_FAILURE);
+}
/* Anything here shall be unreachable. */
}
@@ -59,15 +84,35 @@ int fork_helper (int argc, char **argv) {
int main (int argc, char **argv) {
#ifdef Q_OS_UNIX
- /*
- * setsid() may succeed and we become a session and process
- * group leader, or it may fail indicating that we already
- * are a process group leader. Either way is fine.
- */
- setsid ();
-
- /* We should be process group leader by now. */
- return (fork_helper (argc, argv));
+ /* Scan program arguments for --unixhelper flag. */
+ bool unix_helper_request = 0;
+ for (int i = 0; i < argc; ++i) {
+std::string cur_arg (argv[i]);
+
+/* Make the current argument lowercase. */
+std::transform (cur_arg.begin (), cur_arg.end (), cur_arg.begin (),
std::tolower);
+
+if ((!cur_arg.empty ()) && (cur_arg.compare ("--unixhelper"))) {
+ unix_helper_request = 1;
+ break;
+}
+ }
+
+ if (unix_helper_request) {
+/* We were instructed to start as the UNIX cleanup helper tool. */
+return (unixhelper::unix_cleanup ());
+ }
+ else {
+/*
+ * setsid() may succeed and we become a session and process
+ * group leader, or it may fail indicating that we already
+ * are a process group leader. Either way is fine.
+ */
+setsid ();
+
+/* We should be process group leader by now. */
+return (fork_helper (argc, argv));
+ }
#else /* defined (Q_OS_UNIX) */
return (wrap_x2go_main (argc, argv));
#endif /* defined (Q_OS_UNIX) */
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
