JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dlfcn.cc (get_full_path_of_dll): Drop enforcing a .dll suffix.

Browse Source 
(dlopen): If last path component has no dot, append one to override
	automatic .dll suffix in LoadLibrary.
This commit is contained in:
Corinna Vinschen 2009-11-02 14:39:08 +00:00
parent 09b07be520
commit df95867087
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-02 Corinna Vinschen <corinna@vinschen.de>
* dlfcn.cc (get_full_path_of_dll): Drop enforcing a .dll suffix.
(dlopen): If last path component has no dot, append one to override
automatic .dll suffix in LoadLibrary.
2009-11-02 Corinna Vinschen <corinna@vinschen.de>
* miscfuncs.h (transform_chars): Declare. Define inline variation here.

15
winsup/cygwin/dlfcn.cc
View File

@ -53,15 +53,6 @@ get_full_path_of_dll (const char* str, path_conv &real_filename)
strcpy (name, str); /* Put it somewhere where we can manipulate it. */
/* Add extension if necessary */
if (str[len - 1] != '.')
{
/* Add .dll only if no extension provided. */
const char *p = strrchr (str, '.');
if (!p || strpbrk (p, "\\/"))
strcat (name, ".dll");
}
if (isabspath (name) ||
(check_path_access ("LD_LIBRARY_PATH=", name, real_filename)
?: check_path_access ("/usr/lib", name, real_filename)) == NULL)
@ -93,6 +84,12 @@ dlopen (const char *name, int)
wchar_t *path = tp.w_get ();
pc.get_wide_win32_path (path);
/* Check if the last path component contains a dot. If so,
leave the filename alone. Otherwise add a traiing dot
to override LoadLibrary's automatic adding of a ".dll" suffix. */
wchar_t *last_bs = wcsrchr (path, L'\\');
if (last_bs && !wcschr (last_bs, L'.'))
wcscat (last_bs, L".");
/* Workaround for broken DLLs built against Cygwin versions 1.7.0-49
up to 1.7.0-57. They override the cxx_malloc pointer in their