libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-03-02 13:05:42 +08:00
Code Issues Projects Releases Wiki Activity

* cygcheck.cc (load_cygwin): Don't touch $PATH for now.

Browse Source 
(print_version): Fix copyright.
	* strace.cc (print_version): Ditto.
This commit is contained in:
Corinna Vinschen 2005-05-15 12:29:47 +00:00
parent 1f7b9e8bc6
commit 90253b8276
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-15 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (load_cygwin): Don't touch $PATH for now.
(print_version): Fix copyright.
* strace.cc (print_version): Ditto.
2005-05-13 Christopher Faylor <cgf@timesys.com> 2005-05-13 Christopher Faylor <cgf@timesys.com>
* mount.cc (mount_commands): Display "-X" option when appropriate. * mount.cc (mount_commands): Display "-X" option when appropriate.

15
winsup/utils/cygcheck.cc
View File

@ -1,6 +1,6 @@
/* cygcheck.cc /* cygcheck.cc
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc. Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -1424,7 +1424,7 @@ print_version ()
printf ("\ printf ("\
cygcheck version %.*s\n\ cygcheck version %.*s\n\
System Checker for Cygwin\n\ System Checker for Cygwin\n\
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.\n\ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.\n\
Compiled on %s\n\ Compiled on %s\n\
", len, v, __DATE__); ", len, v, __DATE__);
} }
@ -1459,10 +1459,19 @@ load_cygwin (int& argc, char **&argv)
char **envp = (char **) cygwin_internal (CW_ENVP); char **envp = (char **) cygwin_internal (CW_ENVP);
if (envp) if (envp)
{ {
/* Store path and revert to this value, otherwise path gets overwritten
by the POSIXy Cygwin variation, which breaks cygcheck.
Another approach would be to use the Cygwin PATH and convert it to
Win32 again. */
char *path = NULL;
while (*_environ) while (*_environ)
{
if (!strncmp (*_environ, "PATH=", 5))
path = strdup (*_environ);
nuke (*_environ); nuke (*_environ);
}
for (char **ev = envp; *ev; ev++) for (char **ev = envp; *ev; ev++)
putenv (*ev); putenv (!strncmp (*ev, "PATH=", 5) ? path : *ev);
} }
} }

2
winsup/utils/strace.cc
View File

@ -890,7 +890,7 @@ print_version ()
printf ("\ printf ("\
%s (cygwin) %.*s\n\ %s (cygwin) %.*s\n\
System Trace\n\ System Trace\n\
Copyright 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.\n\ Copyright 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.\n\
Compiled on %s\n\ Compiled on %s\n\
", pgm, len, v, __DATE__); ", pgm, len, v, __DATE__);
} }