[maemo-commits] [maemo-commits] r14981 - in projects/haf/trunk/maemo-launcher: . launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-12-14 20:39:14 +0200 (Fri, 14 Dec 2007)
New Revision: 14981

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/launcher/launcher.c
Log:
Move closing the fd outside invoked_send_fake_exit


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-14 18:37:03 UTC (rev 14980)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-14 18:39:14 UTC (rev 14981)
@@ -1,5 +1,11 @@
 2007-12-14  Guillem Jover  <guillem.jover at nokia.com>
 
+	* launcher/launcher.c (invoked_send_fake_exit): Move closing the file
+	descriptor to ...
+	(main): ... here.
+
+2007-12-14  Guillem Jover  <guillem.jover at nokia.com>
+
 	* launcher/launcher.c (invoked_send_fake_exit): Move function
 	definition closer to other invoked_ functions.
 

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-12-14 18:37:03 UTC (rev 14980)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-12-14 18:39:14 UTC (rev 14981)
@@ -349,7 +349,6 @@
 {
   /* Send a fake exit code, so the invoker does not wait for us. */
   invoked_send_exit(fd, 0);
-  close(child.sock);
 
   return true;
 }
@@ -851,7 +850,10 @@
 	child.name = prog.name;
 
 	if (!kindergarten_insert_child(kg, &child))
+	{
 	  invoked_send_fake_exit(child.sock);
+	  close(child.sock);
+	}
       }
       else
 	close(sd);