Merge branch 'cygwin-patches-for-1.11' into cygwin-release-1.11xserver-cygwin-1.11.2-1

1 files changed, 20 insertions, 0 deletions

diff --git a/os/utils.c b/os/utils.c
index f8c7178de..9b5f0d4bb 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1254,6 +1254,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(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(char *command)
 {
@@ -1295,6 +1314,7 @@ System(char *command)
 
     return p == -1 ? -1 : status;
 }
+#endif
 
 static struct pid {
     struct pid *next;