From 88f967a8bdedb416ca0f476f599bdec2f212204f Mon Sep 17 00:00:00 2001
From: tobias <tobias@openbsd.org>
Date: Tue, 6 May 2008 15:12:04 +0000
Subject: [PATCH] Signal handler of SIGCHLD calls waitpid() which sets errno on
 error. To avoid clubbering of errno in normal context, save_errno got
 introduced.

ok oga
---
 app/cwm/calmwm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c
index 84bff28a5..d4e20efbe 100644
--- a/app/cwm/calmwm.c
+++ b/app/cwm/calmwm.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.c,v 1.16 2008/04/15 20:24:41 oga Exp $
+ * $Id: calmwm.c,v 1.17 2008/05/06 15:12:04 tobias Exp $
  */
 
 #include "headers.h"
@@ -300,12 +300,15 @@ static void
 _sigchld_cb(int which)
 {
 	pid_t pid;
+	int save_errno = errno;
 	int status;
 
 	/* Collect dead children. */
 	while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
 	    (pid < 0 && errno == EINTR))
 		;
+
+	errno = save_errno;
 }
 
 __dead void