frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

So, like, checking return codes of system calls (signal, etc) is good. 

Also, only restore an old signal handler if one was actually set
(prevents the server from dying on OS X).
This commit is contained in:
Ben Byer 2007-09-21 17:07:36 -07:00
parent eb82b19aa7
commit abe0a51f3f
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
os/utils.c
View File

@ -285,7 +285,8 @@ OsSignal(sig, handler)
sigaddset(&act.sa_mask, sig); sigaddset(&act.sa_mask, sig);
act.sa_flags = 0; act.sa_flags = 0;
act.sa_handler = handler; act.sa_handler = handler;
sigaction(sig, &act, &oact); if (sigaction(sig, &act, &oact))
perror("sigaction");
return oact.sa_handler; return oact.sa_handler;
#endif #endif
} }
@ -1684,6 +1685,10 @@ System(char *command)
#ifdef SIGCHLD #ifdef SIGCHLD
csig = signal(SIGCHLD, SIG_DFL); csig = signal(SIGCHLD, SIG_DFL);
if (csig == SIG_ERR) {
perror("signal");
return -1;
}
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -1708,7 +1713,10 @@ System(char *command)
} }
#ifdef SIGCHLD #ifdef SIGCHLD
signal(SIGCHLD, csig); if (signal(SIGCHLD, csig) == SIG_ERR) {
perror("signal");
return -1;
}
#endif #endif
return p == -1 ? -1 : status; return p == -1 ? -1 : status;
@ -1745,13 +1753,18 @@ Popen(char *command, char *type)
/* Ignore the smart scheduler while this is going on */ /* Ignore the smart scheduler while this is going on */
old_alarm = signal(SIGALRM, SIG_IGN); old_alarm = signal(SIGALRM, SIG_IGN);
if (old_alarm == SIG_ERR) {
perror("signal");
return NULL;
}
switch (pid = fork()) { switch (pid = fork()) {
case -1: /* error */ case -1: /* error */
close(pdes[0]); close(pdes[0]);
close(pdes[1]); close(pdes[1]);
xfree(cur); xfree(cur);
signal(SIGALRM, old_alarm); if (signal(SIGALRM, old_alarm) == SIG_ERR)
perror("signal");
return NULL; return NULL;
case 0: /* child */ case 0: /* child */
if (setgid(getgid()) == -1) if (setgid(getgid()) == -1)
@ -1927,7 +1940,10 @@ Pclose(pointer iop)
/* allow EINTR again */ /* allow EINTR again */
OsReleaseSignals (); OsReleaseSignals ();
signal(SIGALRM, old_alarm); if (old_alarm && signal(SIGALRM, old_alarm) == SIG_ERR) {
perror("signal");
return -1;
}
return pid == -1 ? -1 : pstat; return pid == -1 ? -1 : pstat;
} }