Enlightenment CVS committal

Author  : xcomputerman
Project : e17
Module  : apps/entrance

Dir     : e17/apps/entrance/src/daemon


Modified Files:
        spawner.c 


Log Message:
Spawner catching SIGCHLDs from spawned xsession processes that are not part
of the actual session. This fix forces it to check pids first.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/spawner.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- spawner.c   3 Nov 2003 01:27:19 -0000       1.11
+++ spawner.c   6 Nov 2003 23:56:26 -0000       1.12
@@ -7,7 +7,6 @@
 /* Entranced_Spawner_Display *d; */
 static Ecore_Event_Handler *_e_handler = NULL;
 static Ecore_Event_Handler *_d_handler = NULL;
-static Ecore_Event_Handler *_sigusr1_handler = NULL;
 static Ecore_Event_Filter *_e_filter = NULL;
 
 static struct sigaction _entrance_x_sa, _entrance_d_sa;
@@ -269,7 +268,7 @@
    is_respawning = 1;
    respawn_timer = ecore_timer_add(15.0, Entranced_Respawn_Reset, d);
 
-   if (e->exe == d->e_exe)
+   if (e->exe == d->e_exe && e->pid == ecore_exe_pid_get(d->e_exe))
    {
       /* Session exited or crashed */
       if (e->exited)
@@ -296,7 +295,7 @@
       }
 
    }
-   else
+   else if (e->pid == d->pid.x)
    {
       /* X terminated for some reason */
       if (e->exited)
@@ -310,6 +309,10 @@
       if (!Entranced_X_Restart(d))
          exit(1);
 
+   }
+   else 
+   {
+      return 1;
    }
 
    Entranced_Spawn_Entrance(d);




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to