diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2016-06-01 13:12:08 +0200 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2016-06-01 13:12:22 +0200 |
commit | 8a31aa37bc97215f137fc705b5f6e43e06683c15 (patch) | |
tree | ee49f4725a2e974b415a689fb449207d2acbcb62 | |
parent | c496a068cf653c7e94eac014542914f087ef4585 (diff) | |
download | cygnal-8a31aa37bc97215f137fc705b5f6e43e06683c15.tar.gz cygnal-8a31aa37bc97215f137fc705b5f6e43e06683c15.tar.bz2 cygnal-8a31aa37bc97215f137fc705b5f6e43e06683c15.zip |
dlopen: Add dot to filename if no slash is present
We're appending a dot to the filename before calling LoadLibrary to
override ".dll" automagic. This only worked for paths, not for simple
filenames since it required a slash in the pathname. Fix that.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r-- | winsup/cygwin/dlfcn.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc index 914411cdb..ad4d96c7e 100644 --- a/winsup/cygwin/dlfcn.cc +++ b/winsup/cygwin/dlfcn.cc @@ -135,7 +135,7 @@ dlopen (const char *name, int flags) /* Check if the last path component contains a dot. If so, leave the filename alone. Otherwise add a trailing dot to override LoadLibrary's automatic adding of a ".dll" suffix. */ - wchar_t *last_bs = wcsrchr (path, L'\\'); + wchar_t *last_bs = wcsrchr (path, L'\\') ?: path; if (last_bs && !wcschr (last_bs, L'.')) wcscat (last_bs, L"."); |