diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-10-12 19:14:07 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-10-12 19:14:07 +0000 |
| commit | 7563a26d9bea54be5679b1876d81a1fdbfc29d5c (patch) | |
| tree | 81d02245445f82b08e8eef9ccdf3aa68e5c79ea7 | |
| parent | 57cd3486e605b8af16705f322c24dc3d5df8ff03 (diff) | |
| download | cygnal-7563a26d9bea54be5679b1876d81a1fdbfc29d5c.tar.gz cygnal-7563a26d9bea54be5679b1876d81a1fdbfc29d5c.tar.bz2 cygnal-7563a26d9bea54be5679b1876d81a1fdbfc29d5c.zip | |
* dlfcn.cc (gfpod_helper): Only check for POSIX dir separator, same as
in get_full_path_of_dll.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/dlfcn.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index de4cefc70..26cc2f8d2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2014-10-12 Corinna Vinschen <corinna@vinschen.de> + * dlfcn.cc (gfpod_helper): Only check for POSIX dir separator, same as + in get_full_path_of_dll. + +2014-10-12 Corinna Vinschen <corinna@vinschen.de> + * dlfcn.cc (set_dl_error): Drop useless __stdcall. (check_path_access): Ditto. Drop FE_CWD from call to find_exec. (gfpod_helper): Call path_conv::check for all paths containing a dir diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc index 0868749f8..46d654f0b 100644 --- a/winsup/cygwin/dlfcn.cc +++ b/winsup/cygwin/dlfcn.cc @@ -41,7 +41,7 @@ check_path_access (const char *mywinenv, const char *name, path_conv& buf) static inline bool gfpod_helper (const char *name, path_conv &real_filename) { - if (strpbrk (name, "/\\")) + if (strchr (name, '/')) real_filename.check (name, PC_SYM_FOLLOW | PC_NULLEMPTY); else if (!check_path_access ("LD_LIBRARY_PATH=", name, real_filename)) check_path_access ("/usr/bin:/usr/lib", name, real_filename); |