external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Use SIGCHLD rather than SIGCLD.

Browse source 
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:
Jon Trulson 2012-08-09 12:24:56 -06:00
parent 0d2f7866ac
commit 686bcfadc7
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cde/programs/dtexec/Main.c
View file

@ -538,7 +538,7 @@ InitializeSignalHandling( void )
sigemptyset(&svec.sa_mask); sigemptyset(&svec.sa_mask);
svec.sa_flags = 0; svec.sa_flags = 0;
svec.sa_handler = SigCld; svec.sa_handler = SigCld;
(void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL); (void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
/* /*
* "Urgent Signal" handlers * "Urgent Signal" handlers
@ -667,7 +667,7 @@ ExecuteCommand (
svec.sa_handler = SIG_DFL; svec.sa_handler = SIG_DFL;
/* Normal */ /* Normal */
(void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL); (void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
/* Urgent */ /* Urgent */
(void) sigaction(SIGTERM, &svec, (struct sigaction *) NULL); (void) sigaction(SIGTERM, &svec, (struct sigaction *) NULL);

4
cde/programs/dtpad/main.c
View file

@ -985,7 +985,7 @@ InitEditSessionAndFirstPad(
sigfillset(&act.sa_mask); sigfillset(&act.sa_mask);
act.sa_flags = 0; act.sa_flags = 0;
act.sa_handler = SigcldHndlr; 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? * Is this really necessary?
*/ */
sigaction(SIGCLD, &act, (struct sigaction *)NULL); sigaction(SIGCHLD, &act, (struct sigaction *)NULL);
} }

2
cde/programs/dtpdmd/dtpdmd.c
View file

@ -383,7 +383,7 @@ main( argc, argv )
sigemptyset(&svec.sa_mask); sigemptyset(&svec.sa_mask);
svec.sa_flags = 0; svec.sa_flags = 0;
svec.sa_handler = handle_SIGCLD; 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. * After this point, we need to trap all X and XIO errors.

4
cde/programs/dtpdmd/records.c
View file

@ -55,7 +55,7 @@ static void block_SIGCLD( void )
int rtn; int rtn;
sigemptyset( &newset ); sigemptyset( &newset );
sigaddset( &newset, SIGCLD ); sigaddset( &newset, SIGCHLD );
rtn = sigprocmask( SIG_BLOCK, &newset, (sigset_t *) NULL ); rtn = sigprocmask( SIG_BLOCK, &newset, (sigset_t *) NULL );
} }
@ -65,7 +65,7 @@ static void unblock_SIGCLD( void )
int rtn; int rtn;
sigemptyset( &newset ); sigemptyset( &newset );
sigaddset( &newset, SIGCLD ); sigaddset( &newset, SIGCHLD );
rtn = sigprocmask( SIG_UNBLOCK, &newset, (sigset_t *) NULL ); rtn = sigprocmask( SIG_UNBLOCK, &newset, (sigset_t *) NULL );
} }

12
cde/programs/dtsession/SmRestore.c
View file

@ -473,11 +473,11 @@ SystemCmd (char *pchCmd)
{ {
void (*signalHandler) (); void (*signalHandler) ();
signalHandler = (void (*)())signal (SIGCLD, SIG_DFL); signalHandler = (void (*)())signal (SIGCHLD, SIG_DFL);
system (pchCmd); system (pchCmd);
signal (SIGCLD, signalHandler); signal (SIGCHLD, signalHandler);
} /* END OF FUNTION SystemCmd */ } /* END OF FUNTION SystemCmd */
@ -896,7 +896,7 @@ RestoreResources( Boolean errorHandlerInstalled, ... )
setegid(smGD.runningGID); setegid(smGD.runningGID);
#endif #endif
#endif #endif
#ifdef __osf__ #if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
#else #else
(void) setpgrp(); (void) setpgrp();
@ -3607,7 +3607,7 @@ StartLocalClient (
_DtEnvControl(DT_ENV_RESTORE_PRE_DT); _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
#ifdef __osf__ #if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
#else #else
(void)setpgrp(); (void)setpgrp();
@ -3843,7 +3843,7 @@ ForkWM( void )
#endif #endif
_DtEnvControl(DT_ENV_RESTORE_PRE_DT); _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
#ifdef __osf__ #if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
#else #else
(void)setpgrp(); (void)setpgrp();
@ -3928,7 +3928,7 @@ KillParent( void )
/* /*
* Disassociate from parent * Disassociate from parent
*/ */
#ifdef __osf__ #if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
#else #else
setpgrp(); setpgrp();

2
cde/programs/dtwm/WmFunction.c
View file

@ -108,7 +108,7 @@ static unsigned int GetEventInverseMask(XEvent *event);
#ifdef WSM #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 #define _NFILE FOPEN_MAX
#endif #endif
#define CLOSE_FILES_ON_EXEC() \ #define CLOSE_FILES_ON_EXEC() \

4
cde/programs/dtwm/WmResParse.c
View file

@ -7504,11 +7504,11 @@ SystemCmd (char *pchCmd)
sa.sa_flags = 0; sa.sa_flags = 0;
sa.sa_handler = SIG_DFL; sa.sa_handler = SIG_DFL;
(void) sigaction (SIGCLD, &sa, &osa); (void) sigaction (SIGCHLD, &sa, &osa);
system (pchCmd); system (pchCmd);
(void) sigaction (SIGCLD, &osa, (struct sigaction *) 0); (void) sigaction (SIGCHLD, &osa, (struct sigaction *) 0);
} }