>From 33d5cd5cd1dc188662d6cd18b3e8f4d902559bcf Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Thu, 25 Aug 2016 14:14:55 +0200 Subject: [PATCH 2/4] dlopen (pathfinder): try each basename per dir Rather than searching within all search dirs for one basename, search for all basenames within one search dir. pathfinder.h (check_path_access): Interchange dir- and basename-loops. --- winsup/cygwin/pathfinder.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/pathfinder.h b/winsup/cygwin/pathfinder.h index a9c74b3..e81d00e 100644 --- a/winsup/cygwin/pathfinder.h +++ b/winsup/cygwin/pathfinder.h @@ -114,12 +114,12 @@ public: Returns true when found. */ bool check_path_access (path_conv& real_filename) { - for (basenamelist::iterator name = basenames_.begin (); - name != basenames_.end (); - ++name) - for (searchdirlist::buffer_iterator dir(searchdirs_.begin ()); - dir != searchdirs_.end (); - ++dir) + for (searchdirlist::buffer_iterator dir(searchdirs_.begin ()); + dir != searchdirs_.end (); + ++dir) + for (basenamelist::iterator name = basenames_.begin (); + name != basenames_.end (); + ++name) { /* Complete the filename path to search for. We have allocated enough memory above. */ -- 2.8.3