From 76eb61923900be1b6fd4f83bb62f48670fe7293c Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 10 Jan 2005 04:13:39 +0000
Subject: [PATCH] * cygrun.c (main): Fix exit code so that it reflects UNIX
 style. * winsup.api/ltp/fork04.c (setup): Accommodate change in putenv
 declaration.

---
 winsup/testsuite/ChangeLog               | 6 ++++++
 winsup/testsuite/cygrun.c                | 2 ++
 winsup/testsuite/winsup.api/ltp/fork04.c | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 181238bba..ed2c5cb31 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-09  Christopher Faylor  <cgf@timesys.com>
+
+	* cygrun.c (main): Fix exit code so that it reflects UNIX style.
+	* winsup.api/ltp/fork04.c (setup): Accommodate change in putenv
+	declaration.
+
 2004-08-24  Corinna Vinschen  <corinna@vinschen.de>
 
 	* winsup.api/mmaptest01.c (main): Accomodate 9x memory usage.
diff --git a/winsup/testsuite/cygrun.c b/winsup/testsuite/cygrun.c
index 63d9863f7..60330ca33 100644
--- a/winsup/testsuite/cygrun.c
+++ b/winsup/testsuite/cygrun.c
@@ -63,5 +63,7 @@ main (int argc, char **argv)
 
   CloseHandle (pi.hProcess);
   CloseHandle (pi.hThread);
+  if (ec > 0xff)
+    ec >>= 8;
   return ec;
 }
diff --git a/winsup/testsuite/winsup.api/ltp/fork04.c b/winsup/testsuite/winsup.api/ltp/fork04.c
index 84bac0579..7e8d80f96 100644
--- a/winsup/testsuite/winsup.api/ltp/fork04.c
+++ b/winsup/testsuite/winsup.api/ltp/fork04.c
@@ -165,7 +165,7 @@ setup()
   tst_tmpdir();
 
   /* add a variable to the environment */
-  putenv("TESTPROG=FRKTCS04");
+  putenv(strdup("TESTPROG=FRKTCS04"));
 
   /* Pause if that option was specified */
   TEST_PAUSE;