Attachment 365647 Details for Bug 588143

[patch] dllmap-fix.diff

dllmap-fix.diff (text/plain), 1.38 KB, created by Marek Habersack on 2010-05-28 22:02:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Habersack

Created: 2010-05-28 22:02:56 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/mono/utils/mono-dl.c b/mono/utils/mono-dl.c
>index 9d45ddf..bd72d51 100644
>--- a/mono/utils/mono-dl.c
>+++ b/mono/utils/mono-dl.c
>@@ -434,29 +434,43 @@ mono_dl_build_path (const char *directory, const char *name, void **iter)
> 	int idx;
> 	const char *prefix;
> 	const char *suffix;
>+	gboolean first_call;
> 	int prlen;
>+	int suffixlen;
> 	char *res;
>+
> 	if (!iter)
> 		return NULL;
> 	idx = GPOINTER_TO_UINT (*iter);
>-	if (idx >= G_N_ELEMENTS (suffixes))
>-		return NULL;
>+	if (idx == 0) {
>+		first_call = TRUE;
>+		suffix = "";
>+		suffixlen = 0;
>+	} else {
>+		idx--;
>+		if (idx >= G_N_ELEMENTS (suffixes))
>+			return NULL;
>+		first_call = FALSE;
>+		suffix = suffixes [idx];
>+		suffixlen = strlen (suffix);
>+	}
> 
> 	prlen = strlen (SOPREFIX);
> 	if (prlen && strncmp (name, SOPREFIX, prlen) != 0)
> 		prefix = SOPREFIX;
> 	else
> 		prefix = "";
>-	/* if the platform prefix is already provided, we suppose the caller knows the full name already */
>-	if (prlen && strncmp (name, SOPREFIX, prlen) == 0)
>+
>+	if (first_call || (suffixlen && strstr (name, suffix) == (name + strlen (name) - suffixlen)))
> 		suffix = "";
>-	else
>-		suffix = suffixes [idx];
>+
> 	if (directory && *directory)
> 		res = g_strconcat (directory, G_DIR_SEPARATOR_S, prefix, name, suffix, NULL);
> 	else
> 		res = g_strconcat (prefix, name, suffix, NULL);
> 	++idx;
>+	if (!first_call)
>+		idx++;
> 	*iter = GUINT_TO_POINTER (idx);
> 	return res;
> }

Actions: View | Diff

Attachments on bug 588143: 348301 | 348302 | 348303 | 348317 | 348318 | 350140 | 350145 | 350152 | 365647