Index: utils/cygcheck.cc
===================================================================
RCS file: /cvs/src/src/winsup/utils/cygcheck.cc,v
retrieving revision 1.90
diff -u -p -b -r1.90 cygcheck.cc
--- utils/cygcheck.cc	8 Feb 2006 14:19:40 -0000	1.90
+++ utils/cygcheck.cc	12 Sep 2006 12:04:40 -0000
@@ -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)