gnome-settings-daemon r602 - in trunk: . gnome-settings-daemon

[behdad svn gnome org]

Author: behdad
Date: Mon Nov 10 15:24:30 2008
New Revision: 602
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=602&view=rev

Log:
2008-11-10  Behdad Esfahbod  <behdad gnome org>

        * gnome-settings-daemon/main.c (daemon_start), (daemon_detach),
        (daemon_terminate_parent), (main): Fork before gtk_init (bug #559695)

Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/main.c

Modified: trunk/gnome-settings-daemon/main.c
==============================================================================
--- trunk/gnome-settings-daemon/main.c	(original)
+++ trunk/gnome-settings-daemon/main.c	Mon Nov 10 15:24:30 2008
@@ -227,42 +227,47 @@
                                unused_data);
 }
 
-static gboolean
-daemonize (void)
+
+/* We want the parent process to quit after initializing all plugins,
+ * but we have to do all the work in the child process.  We can't
+ * initialize in parent and then fork here: that is not clean with
+ * X display and DBUS where we would make the connection from one
+ * process and continue using it from the other. So, we just make the
+ * parent to fork early and wait. */
+
+static void
+daemon_start (void)
 {
         int child_pid;
         char buf[1];
 
+        if (no_daemon)
+                return;
+
+        gnome_settings_profile_msg ("forking daemon");
+
         signal (SIGPIPE, SIG_IGN);
         pipe (pipefds);
         child_pid = fork ();
 
         switch (child_pid) {
         case -1:
-                return FALSE;
+                g_error ("Could not daemonize: %s", g_strerror (errno));
+
+                exit (EXIT_FAILURE);
 
         case 0:
                 /* child */
 
-                /* disconnect */
-                setsid ();
-                close (0);
-                close (1);
-                open ("/dev/null", O_RDONLY);
-                open ("/dev/null", O_WRONLY);
-
-                /* get outta the way */
-                chdir ("/");
-                umask (0117);
-
                 close (pipefds[0]);
 
-                return TRUE;
+                return;
 
          default:
                 /* parent */
 
                 close (pipefds[1]);
+
                 /* Wait for child to signal that we are good to go. */
                 read (pipefds[0], buf, 1);
 
@@ -270,6 +275,38 @@
         }
 }
 
+static void
+daemon_detach (void)
+{
+        if (no_daemon)
+                return;
+
+        gnome_settings_profile_msg ("detaching daemon");
+
+        /* disconnect */
+        setsid ();
+        close (0);
+        close (1);
+        open ("/dev/null", O_RDONLY);
+        open ("/dev/null", O_WRONLY);
+
+        /* get outta the way */
+        chdir ("/");
+        umask (0117);
+}
+
+static void
+daemon_terminate_parent (void)
+{
+        if (no_daemon)
+                return;
+
+        gnome_settings_profile_msg ("terminating parent");
+
+        write (pipefds[1], "1", 1);
+        close (pipefds[1]);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -282,6 +319,8 @@
 
         gnome_settings_profile_start (NULL);
 
+        daemon_start ();
+
         bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
@@ -299,17 +338,14 @@
                 } else {
                         g_warning ("Unable to initialize GTK+");
                 }
-                exit (1);
+                daemon_terminate_parent ();
+                exit (EXIT_FAILURE);
         }
         gnome_settings_profile_end ("gtk init");
 
-        g_log_set_default_handler (gsd_log_default_handler, NULL);
+        daemon_detach ();
 
-        if (! no_daemon) {
-                gnome_settings_profile_start ("daemon initialization");
-                if (! daemonize ())
-                        g_error ("Could not daemonize: %s", g_strerror (errno));
-        }
+        g_log_set_default_handler (gsd_log_default_handler, NULL);
 
         bus = get_session_bus ();
         if (bus == NULL) {
@@ -347,19 +383,7 @@
                 }
         }
 
-        /* Notify parent to exit.
-         *
-         * We want the parent process to quit after initializaing all plugins,
-         * but we have to do all the work in the child process.  We can't
-         * initialize in parent and then fork here: that is not clean with
-         * X display and DBUS where we would make the connection from one
-         * process and continue using from the other. So, we just made the
-         * parent to fork early and wait. */
-        if (! no_daemon) {
-                write (pipefds[1], "1", 1);
-                close (pipefds[1]);
-                gnome_settings_profile_end ("daemon initialization");
-        }
+        daemon_terminate_parent ();
 
         gtk_main ();