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

os/utils.c: Provide only stubs for Lock/UnlockServer on WIN32 

MinGW and MSVC lack the POSIX functions to compile the lock file code.

Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
This commit is contained in:
Ryan Pavlik 2011-10-21 12:32:49 -05:00 committed by Jon TURNEY
parent 74735c5ebf
commit f32ad6dd31
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os/utils.c
View File

@ -235,6 +235,19 @@ OsSignal(int sig, OsSigHandlerPtr handler)
#define LOCK_PREFIX "/.X" #define LOCK_PREFIX "/.X"
#define LOCK_SUFFIX "-lock" #define LOCK_SUFFIX "-lock"
#if !defined(WIN32) || defined(__CYGWIN__)
#define LOCK_SERVER
#endif
#ifndef LOCK_SERVER
void
LockServer(void)
{}
void
UnlockServer(void)
{}
#else /* LOCK_SERVER */
static Bool StillLocking = FALSE; static Bool StillLocking = FALSE;
static char LockFile[PATH_MAX]; static char LockFile[PATH_MAX];
static Bool nolock = FALSE; static Bool nolock = FALSE;
@ -382,6 +395,7 @@ UnlockServer(void)
(void) unlink(LockFile); (void) unlink(LockFile);
} }
} }
#endif /* LOCK_SERVER */
/* Force connections to close on SIGHUP from init */ /* Force connections to close on SIGHUP from init */
@ -503,7 +517,9 @@ UseMsg(void)
#ifdef RLIMIT_STACK #ifdef RLIMIT_STACK
ErrorF("-ls int limit stack space to N Kb\n"); ErrorF("-ls int limit stack space to N Kb\n");
#endif #endif
#ifdef LOCK_SERVER
ErrorF("-nolock disable the locking mechanism\n"); ErrorF("-nolock disable the locking mechanism\n");
#endif
ErrorF("-nolisten string don't listen on protocol\n"); ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n"); ErrorF("-noreset don't reset after last client exists\n");
ErrorF("-background [none] create root window with no background\n"); ErrorF("-background [none] create root window with no background\n");
@ -664,7 +680,9 @@ ProcessCommandLine(int argc, char *argv[])
if (++i < argc) { if (++i < argc) {
displayfd = atoi(argv[i]); displayfd = atoi(argv[i]);
display = NULL; display = NULL;
#ifdef LOCK_SERVER
nolock = TRUE; nolock = TRUE;
#endif
} }
else else
UseMsg(); UseMsg();
@ -744,6 +762,7 @@ ProcessCommandLine(int argc, char *argv[])
UseMsg(); UseMsg();
} }
#endif #endif
#ifdef LOCK_SERVER
else if (strcmp(argv[i], "-nolock") == 0) { else if (strcmp(argv[i], "-nolock") == 0) {
#if !defined(WIN32) && !defined(__CYGWIN__) #if !defined(WIN32) && !defined(__CYGWIN__)
if (getuid() != 0) if (getuid() != 0)
@ -753,6 +772,7 @@ ProcessCommandLine(int argc, char *argv[])
#endif #endif
nolock = TRUE; nolock = TRUE;
} }
#endif
else if (strcmp(argv[i], "-nolisten") == 0) { else if (strcmp(argv[i], "-nolisten") == 0) {
if (++i < argc) { if (++i < argc) {
if (_XSERVTransNoListen(argv[i])) if (_XSERVTransNoListen(argv[i]))