diff options
| author | Christopher Faylor <me@cgf.cx> | 2008-08-04 19:30:06 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2008-08-04 19:30:06 +0400 |
| commit | ea8432dfb1f2d00e46847e676706823dbfd1532c (patch) | |
| tree | 86c5236d70f34e1e8f5f2593deaaffc6f42e8fd0 /winsup/utils | |
| parent | ef432bbddfca089ccb55adb0408c48e4381547a5 (diff) | |
* cygcheck.cc (load_cygwin): Duplicate argv list since it disappears when
cygwin1.dll is unloaded.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 7eea85465..abab8df7c 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2008-08-04 Christopher Faylor <me+cygwin@cgf.cx> + + * cygcheck.cc (load_cygwin): Duplicate argv list since it disappears + when cygwin1.dll is unloaded. + 2008-07-30 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> * Makefile.in: Link cygcheck with -lntdll even without mingw-zlib. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index f04fcf229..a8a45bcd2 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -2024,8 +2024,15 @@ load_cygwin (int& argc, char **&argv) { char **av = (char **) cygwin_internal (CW_ARGV); if (av && ((DWORD) av != (DWORD) -1)) - for (argc = 0, argv = av; *av; av++) - argc++; + { + /* Copy cygwin's idea of the argument list into this Window application. */ + for (argc = 0; av[argc]; argc++) + continue; + argv = (char **) calloc (argc + 1, sizeof (char *)); + for (char **argvp = argv; *av; av++) + *argvp++ = strdup (*av); + } + char **envp = (char **) cygwin_internal (CW_ENVP); if (envp && ((DWORD) envp != (DWORD) -1)) |