From aa45b3b73d945ca6f6f8101614131f5c39e5d8ac Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 13 Sep 2006 15:32:04 +0000
Subject: [PATCH] Check in previously mentioned change to cygcheck.cc

---
 winsup/utils/cygcheck.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 527cca61c..0cbde87f0 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1835,6 +1835,10 @@ main (int argc, char **argv)
   bool ok = true;
   load_cygwin (argc, argv);
 
+  /* Need POSIX sorting while parsing args, but don't forget the
+     user's original environment.  */
+  char *posixly = getenv ("POSIXLY_CORRECT");
+  if (posixly == NULL)
   (void) putenv("POSIXLY_CORRECT=1");
   while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
     switch (i)
@@ -1877,6 +1881,8 @@ main (int argc, char **argv)
        /*NOTREACHED*/}
   argc -= optind;
   argv += optind;
+  if (posixly == NULL)
+    putenv ("POSIXLY_CORRECT=");
 
   if (argc == 0 && !sysinfo && !keycheck && !check_setup && !list_package)
     if (givehelp)