[PATCH 2/4] dlopen (pathfinder): try each basename per dir

Michael Haubenwallner michael.haubenwallner@ssi-schaefer.com
Wed Aug 31 18:08:00 GMT 2016


Rather than searching all search dirs per one basename,
search for all basenames within per 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 bbba168..c306604 100644
--- a/winsup/cygwin/pathfinder.h
+++ b/winsup/cygwin/pathfinder.h
@@ -182,12 +182,12 @@ public:
 	     basenamelist::member const ** found_basename = NULL)
   {
     char const * critname = criterion.name ();
-    for (basenamelist::iterator name = basenames_.begin ();
-	 name != basenames_.end ();
-	 ++name)
-      for (searchdirlist::iterator dir(searchdirs_.begin ());
-	   dir != searchdirs_.end ();
-	   ++dir)
+    for (searchdirlist::iterator dir(searchdirs_.begin ());
+	 dir != searchdirs_.end ();
+	 ++dir)
+      for (basenamelist::iterator name = basenames_.begin ();
+	   name != basenames_.end ();
+	   ++name)
 	if (criterion.test (dir, name))
 	  {
 	    debug_printf ("(%s), take %s%s", critname,
-- 
2.7.3



More information about the Cygwin-patches mailing list