From 3484e44c7d3eb8af684a9d0dff964680f9e25b78 Mon Sep 17 00:00:00 2001
From: Wilhelm Schuermann <wimschuermann@googlemail.com>
Date: Sat, 21 Feb 2015 21:05:29 +0100
Subject: [PATCH 1/2] CMake

- Added workaround for Cygwin build errors.
---
 CMakeLists.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c01904417..8fb4015de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,13 +28,13 @@ CHECK_CXX_COMPILER_FLAG("-std=c++0x" _HAS_CXX0X)
 CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)
 
 if (_HAS_CXX11)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  set (_CXX11_FLAGS "-std=c++11")
 elseif (_HAS_CXX0X)
   message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option.  Consider upgrading.")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+  set (_CXX11_FLAGS "-std=c++0x")
 elseif (_HAS_GNU0X)
   message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+  set (_CXX11_FLAGS "-std=gnu++0x")
 else (_HAS_CXX11)
  message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
 endif (_HAS_CXX11)
@@ -43,7 +43,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set (DARWIN true)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
   set (KFREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -58,10 +58,16 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
   set (GNUHURD true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
   set (CYGWIN true)
+  # NOTE: Not setting -std=gnu++0x leads to compile errors even with
+  #       GCC 4.8.3, and debugging those leads to insanity. Adding this
+  #       workaround instead of fixing Cygwin.
+  set (_CXX11_FLAGS "-std=gnu++0x")
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
+set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")
+
 if (NETBSD)
    # Since readline, etc likely to be in /usr/pkg/lib, not standard library
    # Otherwise will remove links during install

From af772f4c4918e57ddd90a420e14b8cc0614a9ffa Mon Sep 17 00:00:00 2001
From: Wilhelm Schuermann <wimschuermann@googlemail.com>
Date: Sun, 22 Feb 2015 19:53:31 +0100
Subject: [PATCH 2/2] Util

- Closed dangling pipes in execute (), resolving problems when a hook script
  forks.
---
 src/util.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/util.cpp b/src/util.cpp
index 408db1d05..2e346da74 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -299,9 +299,11 @@ int execute (
 
     if (dup2 (pin[0], STDIN_FILENO) == -1)
       throw std::string (std::strerror (errno));
+    close (pin[0]);
 
     if (dup2 (pout[1], STDOUT_FILENO) == -1)
       throw std::string (std::strerror (errno));
+    close (pout[1]);
 
     char** argv = new char* [args.size () + 2];
     argv[0] = (char*) executable.c_str ();