Blame xserver-1.3.0-xkb-and-loathing.patch
|
 |
78e07cf |
--- xorg-server-1.3.0.0/os/utils.c.jx 2007-04-25 13:28:05.000000000 -0400
|
|
|
78e07cf |
+++ xorg-server-1.3.0.0/os/utils.c 2007-04-30 14:33:04.000000000 -0400
|
|
|
78e07cf |
@@ -1725,6 +1725,8 @@
|
|
|
78e07cf |
int pid;
|
|
|
78e07cf |
} *pidlist;
|
|
|
78e07cf |
|
|
|
78e07cf |
+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
|
|
|
78e07cf |
+
|
|
|
78e07cf |
pointer
|
|
|
78e07cf |
Popen(char *command, char *type)
|
|
|
78e07cf |
{
|
|
|
78e07cf |
@@ -1746,11 +1748,15 @@
|
|
|
78e07cf |
return NULL;
|
|
|
78e07cf |
}
|
|
|
78e07cf |
|
|
|
78e07cf |
+ /* Ignore the smart scheduler while this is going on */
|
|
|
78e07cf |
+ old_alarm = signal(SIGALRM, SIG_IGN);
|
|
|
78e07cf |
+
|
|
|
78e07cf |
switch (pid = fork()) {
|
|
|
78e07cf |
case -1: /* error */
|
|
|
78e07cf |
close(pdes[0]);
|
|
|
78e07cf |
close(pdes[1]);
|
|
|
78e07cf |
xfree(cur);
|
|
|
78e07cf |
+ signal(SIGALRM, old_alarm);
|
|
|
78e07cf |
return NULL;
|
|
|
78e07cf |
case 0: /* child */
|
|
|
78e07cf |
if (setgid(getgid()) == -1)
|
|
|
78e07cf |
@@ -1926,6 +1932,8 @@
|
|
|
78e07cf |
/* allow EINTR again */
|
|
|
78e07cf |
OsReleaseSignals ();
|
|
|
78e07cf |
|
|
|
78e07cf |
+ signal(SIGALRM, old_alarm);
|
|
|
78e07cf |
+
|
|
|
78e07cf |
return pid == -1 ? -1 : pstat;
|
|
|
78e07cf |
}
|
|
|
78e07cf |
|