Fri Feb 23 15:06:57 CET 2007 Paolo Molaro <lupus@ximian.com>

	* loader.c: allow case-insensitive matching of the dll name
	in dllmap handling when prefixed with "i:".

svn path=/trunk/mono/; revision=73362

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 1d909e83663662ce4479ae27429af0d6c109a977..f3e928f90a64e7f58547f89a5fc3327c5bb0eb03 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+
+Fri Feb 23 15:06:57 CET 2007 Paolo Molaro <lupus@ximian.com>
+
+       * loader.c: allow case-insensitive matching of the dll name
+       in dllmap handling when prefixed with "i:".
+
 2007-02-20  Jonathan Chambers  <joncham@gmail.com>
 
        * threads.c: Fix #ifdef for dummy_apc function for VS.

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index e12800b2c2041ba4d36cf34590a3a91fc01be52c..932c58d9485774fda25d772ed68e4535a01e8a3e 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -952,8 +952,12 @@ mono_dllmap_lookup_list (MonoDllMap *dll_map, const char *dll, const char* func,
         * later entries win.
         */
        for (; dll_map; dll_map = dll_map->next) {
-               if (strcmp (dll_map->dll, dll))
+               if (dll_map->dll [0] == 'i' && dll_map->dll [1] == ':') {
+                       if (g_ascii_strcasecmp (dll_map->dll + 2, dll))
+                               continue;
+               } else if (strcmp (dll_map->dll, dll)) {
                        continue;
+               }
                if (!found && dll_map->target) {
                        *rdll = dll_map->target;
                        found = 1;