diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-11-04 17:00:45 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-11-04 17:00:45 +0000 |
| commit | b5f48aa96165f6f18f4f5c2b337171c626c6b423 (patch) | |
| tree | 15260f52949ccf73e45c16c034540b9123cff86f /winsup/utils/cygcheck.cc | |
| parent | 44a019897fde5a5fbbd2a36c8a6c99066ec18d42 (diff) | |
| download | cygnal-b5f48aa96165f6f18f4f5c2b337171c626c6b423.tar.gz cygnal-b5f48aa96165f6f18f4f5c2b337171c626c6b423.tar.bz2 cygnal-b5f48aa96165f6f18f4f5c2b337171c626c6b423.zip | |
* cygcheck.cc (cygwin_dll_path): New global variable.
(load_cygwin): Fetch cygwin DLL path and store in cygwin_dll_path.
* strace.cc: Full ditto.
* path.cc (read_mounts): First use the path stored in cygwin_dll_path,
if available. Then fall back to fetching own path. Add comment.
Drop printing warnings since they look funny in strace output.
Diffstat (limited to 'winsup/utils/cygcheck.cc')
| -rw-r--r-- | winsup/utils/cygcheck.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 62065d25b..da151ae44 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -2270,6 +2270,7 @@ nuke (char *ev) extern "C" { unsigned long (*cygwin_internal) (int, ...); +WCHAR cygwin_dll_path[32768]; }; static void @@ -2279,6 +2280,7 @@ load_cygwin (int& argc, char **&argv) if (!(h = LoadLibrary ("cygwin1.dll"))) return; + GetModuleFileNameW (h, cygwin_dll_path, 32768); if ((cygwin_internal = (DWORD (*) (int, ...)) GetProcAddress (h, "cygwin_internal"))) { char **av = (char **) cygwin_internal (CW_ARGV); |