[X2Go-Commits] [x2goclient] 05/25: x2goclient.cpp: use setsid() on UNIX to become session and process group leader.

git-admin at x2go.org git-admin at x2go.org
Fri Mar 20 05:40:33 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 aadb5c0f5b8c57ca9896c3c9f1501dfe85685d8e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Mar 16 20:30:49 2015 +0100

    x2goclient.cpp: use setsid() on UNIX to become session and process group leader.
    
    If that fails, fork, terminate the parent and execute setsid() in the
    child process. Use fork_helper() to start the UNIX cleanup helper in a
    child process and continue with the main application in the parent.
---
 debian/changelog   |    4 ++++
 src/x2goclient.cpp |   43 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3f7352..7f3b86e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -244,6 +244,10 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - x2goclient.cpp: wrap X2Go Client main function and use that.
     - x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup
       helper.
+    - x2goclient.cpp: use setsid() on UNIX to become session and process group
+      leader. If that fails, fork, terminate the parent and execute setsid()
+      in the child process. Use fork_helper() to start the UNIX cleanup helper
+      in a child process and continue with the main application in the parent.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index f285f40..1a57178 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -54,7 +54,44 @@ int fork_helper (int argc, char **argv) {
 }
 #endif /* defined (Q_OS_UNIX) */
 
-int main(int argc, char *argv[])
-{
-	return (wrap_x2go_main (argc, argv));
+int main (int argc, char **argv) {
+#ifdef Q_OS_UNIX
+  if (-1 == setsid ()) {
+    std::cerr << "Unable to create a new process session: " << std::strerror (errno) << "\n";
+
+    std::cerr << "Trying to fork." << std::endl;
+    pid_t tmp_pid = fork ();
+
+    /* Child. */
+    if (0 == tmp_pid) {
+        /* Trying to get a new session and become session + process group leader again. */
+        if (-1 == setsid ()) {
+          std::cerr << "Child was unable to create a new process session: " << std::strerror (errno) << "\n";
+          std::cerr << "Terminating. Please report a bug, refer to this documentation: http://wiki.x2go.org/doku.php/wiki:bugs" << std::endl;
+
+          std::exit (EXIT_FAILURE);
+        }
+
+        /* By now, we should be session and group leader. */
+        return (fork_helper (argc, argv));
+    }
+    /* Error. */
+    else if (-1 == tmp_pid) {
+      std::cerr << "Error while forking: " << std::strerror (errno) << std::endl;
+      std::cerr << "Terminating. Please report a bug, refer to this documentation: http://wiki.x2go.org/doku.php/wiki:bugs" << std::endl;
+
+      std::edit (EXIT_FAILURE);
+    }
+    /* Parent. Just die here. */
+    else {
+      std::exit (EXIT_SUCCESS);
+    }
+  }
+  else {
+    /* setsid() worked. Starting helper and main program. */
+    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


More information about the x2go-commits mailing list