mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Use SIGCHLD rather than SIGCLD.
Patch from Pascal Stumpf <Pascal.Stumpf@cubes.de> The official POSIX name for this signal is SIGCHLD. Linux probably has SIGCLD only for SysV compatibility, but BSD does not.
This commit is contained in:
parent
0d2f7866ac
commit
686bcfadc7
7 changed files with 16 additions and 16 deletions
|
@ -538,7 +538,7 @@ InitializeSignalHandling( void )
|
|||
sigemptyset(&svec.sa_mask);
|
||||
svec.sa_flags = 0;
|
||||
svec.sa_handler = SigCld;
|
||||
(void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
|
||||
(void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
|
||||
|
||||
/*
|
||||
* "Urgent Signal" handlers
|
||||
|
@ -667,7 +667,7 @@ ExecuteCommand (
|
|||
svec.sa_handler = SIG_DFL;
|
||||
|
||||
/* Normal */
|
||||
(void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
|
||||
(void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
|
||||
|
||||
/* Urgent */
|
||||
(void) sigaction(SIGTERM, &svec, (struct sigaction *) NULL);
|
||||
|
|
|
@ -985,7 +985,7 @@ InitEditSessionAndFirstPad(
|
|||
sigfillset(&act.sa_mask);
|
||||
act.sa_flags = 0;
|
||||
act.sa_handler = SigcldHndlr;
|
||||
sigaction(SIGCLD, &act, (struct sigaction *)NULL);
|
||||
sigaction(SIGCHLD, &act, (struct sigaction *)NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1591,7 +1591,7 @@ void SigcldHndlr (int dummy)
|
|||
/*
|
||||
* Is this really necessary?
|
||||
*/
|
||||
sigaction(SIGCLD, &act, (struct sigaction *)NULL);
|
||||
sigaction(SIGCHLD, &act, (struct sigaction *)NULL);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -383,7 +383,7 @@ main( argc, argv )
|
|||
sigemptyset(&svec.sa_mask);
|
||||
svec.sa_flags = 0;
|
||||
svec.sa_handler = handle_SIGCLD;
|
||||
(void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
|
||||
(void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
|
||||
|
||||
/*
|
||||
* After this point, we need to trap all X and XIO errors.
|
||||
|
|
|
@ -55,7 +55,7 @@ static void block_SIGCLD( void )
|
|||
int rtn;
|
||||
|
||||
sigemptyset( &newset );
|
||||
sigaddset( &newset, SIGCLD );
|
||||
sigaddset( &newset, SIGCHLD );
|
||||
rtn = sigprocmask( SIG_BLOCK, &newset, (sigset_t *) NULL );
|
||||
}
|
||||
|
||||
|
@ -65,7 +65,7 @@ static void unblock_SIGCLD( void )
|
|||
int rtn;
|
||||
|
||||
sigemptyset( &newset );
|
||||
sigaddset( &newset, SIGCLD );
|
||||
sigaddset( &newset, SIGCHLD );
|
||||
rtn = sigprocmask( SIG_UNBLOCK, &newset, (sigset_t *) NULL );
|
||||
}
|
||||
|
||||
|
|
|
@ -473,11 +473,11 @@ SystemCmd (char *pchCmd)
|
|||
{
|
||||
void (*signalHandler) ();
|
||||
|
||||
signalHandler = (void (*)())signal (SIGCLD, SIG_DFL);
|
||||
signalHandler = (void (*)())signal (SIGCHLD, SIG_DFL);
|
||||
|
||||
system (pchCmd);
|
||||
|
||||
signal (SIGCLD, signalHandler);
|
||||
signal (SIGCHLD, signalHandler);
|
||||
} /* END OF FUNTION SystemCmd */
|
||||
|
||||
|
||||
|
@ -896,7 +896,7 @@ RestoreResources( Boolean errorHandlerInstalled, ... )
|
|||
setegid(smGD.runningGID);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef __osf__
|
||||
#if defined(__osf__) || defined(CSRG_BASED)
|
||||
setsid();
|
||||
#else
|
||||
(void) setpgrp();
|
||||
|
@ -3607,7 +3607,7 @@ StartLocalClient (
|
|||
|
||||
_DtEnvControl(DT_ENV_RESTORE_PRE_DT);
|
||||
|
||||
#ifdef __osf__
|
||||
#if defined(__osf__) || defined(CSRG_BASED)
|
||||
setsid();
|
||||
#else
|
||||
(void)setpgrp();
|
||||
|
@ -3843,7 +3843,7 @@ ForkWM( void )
|
|||
#endif
|
||||
_DtEnvControl(DT_ENV_RESTORE_PRE_DT);
|
||||
|
||||
#ifdef __osf__
|
||||
#if defined(__osf__) || defined(CSRG_BASED)
|
||||
setsid();
|
||||
#else
|
||||
(void)setpgrp();
|
||||
|
@ -3928,7 +3928,7 @@ KillParent( void )
|
|||
/*
|
||||
* Disassociate from parent
|
||||
*/
|
||||
#ifdef __osf__
|
||||
#if defined(__osf__) || defined(CSRG_BASED)
|
||||
setsid();
|
||||
#else
|
||||
setpgrp();
|
||||
|
|
|
@ -108,7 +108,7 @@ static unsigned int GetEventInverseMask(XEvent *event);
|
|||
|
||||
#ifdef WSM
|
||||
|
||||
#if (defined(USL) || defined(__uxp__) || defined(linux)) && !defined(_NFILE)
|
||||
#if (defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)) && !defined(_NFILE)
|
||||
#define _NFILE FOPEN_MAX
|
||||
#endif
|
||||
#define CLOSE_FILES_ON_EXEC() \
|
||||
|
|
|
@ -7504,11 +7504,11 @@ SystemCmd (char *pchCmd)
|
|||
sa.sa_flags = 0;
|
||||
sa.sa_handler = SIG_DFL;
|
||||
|
||||
(void) sigaction (SIGCLD, &sa, &osa);
|
||||
(void) sigaction (SIGCHLD, &sa, &osa);
|
||||
|
||||
system (pchCmd);
|
||||
|
||||
(void) sigaction (SIGCLD, &osa, (struct sigaction *) 0);
|
||||
(void) sigaction (SIGCHLD, &osa, (struct sigaction *) 0);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue