diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-03-25 04:20:04 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-03-25 04:20:04 +0300 |
| commit | ce7a3610725da57c8f90b0f8620fbbb7eb3c1798 (patch) | |
| tree | e777f63d0ddb8102bd181c1ea3ad93ef259feed0 /winsup/utils | |
| parent | 8fdbcd1279527a4eb10bb884f144466bd38514f3 (diff) | |
* cygcheck.cc (dump_sysinfo): Ensure that CYGWIN environment variable is
correctly set.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 328ae0ada..7328dbc94 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2003-03-24 Christopher Faylor <cgf@redhat.com> + + * cygcheck.cc (dump_sysinfo): Ensure that CYGWIN environment variable + is correctly set. + 2003-03-09 Corinna Vinschen <corinna@vinschen.de> * getfacl.c (username): Fix ambiguous printf calls. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 96bf35024..090d077a1 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -950,7 +950,11 @@ dump_sysinfo () fflush (stdout); - char *cygwin = getenv ("CYGWIN") ?: const_cast <char *> ("CYGWIN="); + 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); |