From 7563a26d9bea54be5679b1876d81a1fdbfc29d5c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sun, 12 Oct 2014 19:14:07 +0000 Subject: [PATCH] * dlfcn.cc (gfpod_helper): Only check for POSIX dir separator, same as in get_full_path_of_dll. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/dlfcn.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index de4cefc70..26cc2f8d2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-10-12 Corinna Vinschen + + * dlfcn.cc (gfpod_helper): Only check for POSIX dir separator, same as + in get_full_path_of_dll. + 2014-10-12 Corinna Vinschen * dlfcn.cc (set_dl_error): Drop useless __stdcall. 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); -- 2.43.5