diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-03-12 14:41:51 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-03-12 14:41:51 +0000 |
| commit | 0c6c47ecd1fa99971ca6853337fc9cb888bc6049 (patch) | |
| tree | 746be177b035fc1d2aa20e66f55cb20addbed929 /os/utils.c | |
| parent | b1be72c5ca6cb98ba64637990b142be0f1710a19 (diff) | |
| parent | ea0598773ec2859df09ae62f027db6ee611f51c0 (diff) | |
Merge branch 'cygwin-patches-for-1.12' into cygwin-release-1.12xserver-cygwin-1.12.0-1
Diffstat (limited to 'os/utils.c')
| -rw-r--r-- | os/utils.c | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/os/utils.c b/os/utils.c index 6461ed591..74b1199ca 100644 --- a/os/utils.c +++ b/os/utils.c @@ -235,7 +235,7 @@ OsSignal(int sig, OsSigHandlerPtr handler) static Bool StillLocking = FALSE; static char LockFile[PATH_MAX]; -static Bool nolock = FALSE; +Bool nolock = FALSE; /* * LockServer -- @@ -661,6 +661,17 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } + else if (strcmp(argv[i], "-displayfd") == 0) + { + if (++i < argc) + { + displayfd = atoi(argv[i]); + display = NULL; + nolock = TRUE; + } + else + UseMsg(); + } #ifdef DPMSExtension else if ( strcmp( argv[i], "dpms") == 0) /* ignored for compatibility */ ; @@ -900,6 +911,7 @@ ProcessCommandLine(int argc, char *argv[]) { if (++i < argc) { + SmartScheduleDisable = FALSE; SmartScheduleInterval = atoi(argv[i]); SmartScheduleSlice = SmartScheduleInterval; } @@ -910,6 +922,7 @@ ProcessCommandLine(int argc, char *argv[]) { if (++i < argc) { + SmartScheduleDisable = FALSE; SmartScheduleMaxSlice = atoi(argv[i]); } else @@ -1249,6 +1262,25 @@ OsAbort (void) * as well. As it is now, xkbcomp messages don't end up in the log file. */ +#ifdef __CYGWIN__ +#include <process.h> +int +System(const char *command) +{ + int status; + if (!command) + return 1; + + DebugF("System: `%s'\n", command); + + /* + Use spawnl() rather than execl() to implement System() on cygwin to + avoid fork emulation overhead and brittleness + */ + status = spawnl(_P_WAIT, "/bin/sh", "sh", "-c", command, (char *)NULL); + return status; +} +#else int System(const char *command) { @@ -1290,6 +1322,7 @@ System(const char *command) return p == -1 ? -1 : status; } +#endif static struct pid { struct pid *next; @@ -1299,6 +1332,7 @@ static struct pid { OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */ +#if !defined(__CYGWIN__) pointer Popen(const char *command, const char *type) { @@ -1383,6 +1417,7 @@ Popen(const char *command, const char *type) return iop; } +#endif /* fopen that drops privileges */ pointer |