Add global variable inSignalContext
This will be used for checking for proper logging when in signal context. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
8dc70acbf3
commit
d3725549f0
|
@ -99,6 +99,8 @@ xf86SIGIO(int sig)
|
|||
int save_errno = errno; /* do not clobber the global errno */
|
||||
int r;
|
||||
|
||||
inSignalContext = TRUE;
|
||||
|
||||
ready = xf86SigIOMask;
|
||||
to.tv_sec = 0;
|
||||
to.tv_usec = 0;
|
||||
|
@ -114,6 +116,8 @@ xf86SIGIO(int sig)
|
|||
}
|
||||
/* restore global errno */
|
||||
errno = save_errno;
|
||||
|
||||
inSignalContext = FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
#ifndef _XSERV_GLOBAL_H_
|
||||
#define _XSERV_GLOBAL_H_
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#include "window.h" /* for WindowPtr */
|
||||
|
||||
/* Global X server variables that are visible to mi, dix, os, and ddx */
|
||||
|
@ -23,6 +25,7 @@ extern _X_EXPORT int GrabInProgress;
|
|||
extern _X_EXPORT Bool noTestExtensions;
|
||||
extern _X_EXPORT char *SeatId;
|
||||
extern _X_EXPORT char *ConnectionInfo;
|
||||
extern _X_EXPORT sig_atomic_t inSignalContext;
|
||||
|
||||
#ifdef DPMSExtension
|
||||
extern _X_EXPORT CARD32 DPMSStandbyTime;
|
||||
|
|
|
@ -204,6 +204,8 @@ int auditTrailLevel = 1;
|
|||
|
||||
char *SeatId = NULL;
|
||||
|
||||
sig_atomic_t inSignalContext = FALSE;
|
||||
|
||||
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
|
||||
#define HAS_SAVED_IDS_AND_SETEUID
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue