From 3a7c9917a0272f6a7a3fd603a9fc739124093fd6 Mon Sep 17 00:00:00 2001
From: corinna <corinna>
Date: Wed, 28 Oct 2009 20:41:27 +0000
Subject: [PATCH] 	* cygcheck.cc (pretty_id): Drop arguments.  Don't
 change CYGWIN 	environment variable. 	(dump_sysinfo): Don't tweak CYGWIN
 environment variable, just call 	pretty_id once.

---
 winsup/utils/ChangeLog   |  7 +++++++
 winsup/utils/cygcheck.cc | 22 ++++------------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 825769f0c5..369f75ed32 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygcheck.cc (pretty_id): Drop arguments.  Don't change CYGWIN
+	environment variable.
+	(dump_sysinfo): Don't tweak CYGWIN environment variable, just call
+	pretty_id once.
+
 2009-10-20  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygcheck.cc (dump_sysinfo): Update with latest NT 6.1 versions.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index e0c8a3ac06..1d7db59449 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -59,7 +59,7 @@ void package_list (int, char **);
 void dump_dodgy_apps (int verbose);
 
 
-static const char version[] = "$Revision$";
+static const char version[] = "$Revision: 1.120 $";
 
 static const char *known_env_vars[] = {
   "c_include_path",
@@ -1031,14 +1031,10 @@ scan_registry (RegInfo * prev, HKEY hKey, char *name, int cygwin, bool wow64)
 }
 
 void
-pretty_id (const char *s, char *cygwin, size_t cyglen)
+pretty_id ()
 {
   char *groups[16384];
 
-  strcpy (cygwin + cyglen++, " ");
-  strcpy (cygwin + cyglen, s);
-  putenv (cygwin);
-
   char *id = cygpath ("/bin/id.exe", NULL);
   for (char *p = id; (p = strchr (p, '/')); p++)
     *p = '\\';
@@ -1094,7 +1090,7 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
     }
   ng--;
 
-  printf ("\nOutput from %s (%s)\n", id, s);
+  printf ("\nOutput from %s\n", id);
   int n = 80 / (int) ++sz;
   int i = n > 2 ? n - 2 : 0;
   sz = -sz;
@@ -1479,17 +1475,7 @@ dump_sysinfo ()
 
   fflush (stdout);
 
-  char *cygwin = getenv ("CYGWIN");
-  if (cygwin)
-    cygwin -= strlen ("CYGWIN=");
-  else
-    cygwin = const_cast <char *> ("CYGWIN=");
-  size_t cyglen = strlen (cygwin);
-  cygwin = strcpy ((char *) malloc (cyglen + sizeof (" nontsec")), cygwin);
-  pretty_id ("nontsec", cygwin, cyglen);
-  pretty_id ("ntsec", cygwin, cyglen);
-  cygwin[cyglen] = 0;
-  putenv (cygwin);
+  pretty_id ();
 
   if (!GetSystemDirectory (tmp, 4000))
     display_error ("dump_sysinfo: GetSystemDirectory()");
-- 
2.11.0