Remove the parsing of .config files from get_runtimes_from_exe (). (#48147)

Author: vargaz

src/mono/mono/metadata/domain.c

@@ -1414,115 +1414,6 @@ mono_get_exception_class (void)
 	return mono_defaults.exception_class;
 }
 
-
-static char* get_attribute_value (const gchar **attribute_names, 
-					const gchar **attribute_values, 
-					const char *att_name)
-{
-	int n;
-	for (n=0; attribute_names[n] != NULL; n++) {
-		if (strcmp (attribute_names[n], att_name) == 0)
-			return g_strdup (attribute_values[n]);
-	}
-	return NULL;
-}
-
-static void start_element (GMarkupParseContext *context, 
-                           const gchar         *element_name,
-			   const gchar        **attribute_names,
-			   const gchar        **attribute_values,
-			   gpointer             user_data,
-			   GError             **gerror)
-{
-	AppConfigInfo* app_config = (AppConfigInfo*) user_data;
-	
-	if (strcmp (element_name, "configuration") == 0) {
-		app_config->configuration_count++;
-		return;
-	}
-	if (strcmp (element_name, "startup") == 0) {
-		app_config->startup_count++;
-		return;
-	}
-	
-	if (app_config->configuration_count != 1 || app_config->startup_count != 1)
-		return;
-	
-	if (strcmp (element_name, "requiredRuntime") == 0) {
-		app_config->required_runtime = get_attribute_value (attribute_names, attribute_values, "version");
-	} else if (strcmp (element_name, "supportedRuntime") == 0) {
-		char *version = get_attribute_value (attribute_names, attribute_values, "version");
-		app_config->supported_runtimes = g_slist_append (app_config->supported_runtimes, version);
-	}
-}
-
-static void end_element   (GMarkupParseContext *context,
-                           const gchar         *element_name,
-			   gpointer             user_data,
-			   GError             **gerror)
-{
-	AppConfigInfo* app_config = (AppConfigInfo*) user_data;
-	
-	if (strcmp (element_name, "configuration") == 0) {
-		app_config->configuration_count--;
-	} else if (strcmp (element_name, "startup") == 0) {
-		app_config->startup_count--;
-	}
-}
-
-static const GMarkupParser 
-mono_parser = {
-	start_element,
-	end_element,
-	NULL,
-	NULL,
-	NULL
-};
-
-static AppConfigInfo *
-app_config_parse (const char *exe_filename)
-{
-	AppConfigInfo *app_config;
-	GMarkupParseContext *context;
-	char *text;
-	gsize len;
-	char *config_filename;
-
-	config_filename = g_strconcat (exe_filename, ".config", (const char*)NULL);
-
-	if (!g_file_get_contents (config_filename, &text, &len, NULL)) {
-		g_free (config_filename);
-		return NULL;
-	}
-	g_free (config_filename);
-
-	app_config = g_new0 (AppConfigInfo, 1);
-
-	context = g_markup_parse_context_new (&mono_parser, (GMarkupParseFlags)0, app_config, NULL);
-	if (g_markup_parse_context_parse (context, text, len, NULL)) {
-		g_markup_parse_context_end_parse (context, NULL);
-	}
-	g_markup_parse_context_free (context);
-	g_free (text);
-	return app_config;
-}
-
-static void 
-app_config_free (AppConfigInfo* app_config)
-{
-	char *rt;
-	GSList *list = app_config->supported_runtimes;
-	while (list != NULL) {
-		rt = (char*)list->data;
-		g_free (rt);
-		list = g_slist_next (list);
-	}
-	g_slist_free (app_config->supported_runtimes);
-	g_free (app_config->required_runtime);
-	g_free (app_config);
-}
-
-
 static const MonoRuntimeInfo*
 get_runtime_by_version (const char *version)
 {
@@ -1552,43 +1443,10 @@ get_runtime_by_version (const char *version)
 static GSList*
 get_runtimes_from_exe (const char *file, MonoImage **out_image)
 {
-	AppConfigInfo* app_config;
-	char *version;
 	const MonoRuntimeInfo* runtime = NULL;
 	MonoImage *image = NULL;
 	GSList *runtimes = NULL;
 
-	app_config = app_config_parse (file);
-	
-	if (app_config != NULL) {
-		/* Check supportedRuntime elements, if none is supported, fail.
-		 * If there are no such elements, look for a requiredRuntime element.
-		 */
-		if (app_config->supported_runtimes != NULL) {
-			GSList *list = app_config->supported_runtimes;
-			while (list != NULL) {
-				version = (char*) list->data;
-				runtime = get_runtime_by_version (version);
-				if (runtime != NULL)
-					runtimes = g_slist_prepend (runtimes, (gpointer)runtime);
-				list = g_slist_next (list);
-			}
-			runtimes = g_slist_reverse (runtimes);
-			app_config_free (app_config);
-			return runtimes;
-		}
-		
-		/* Check the requiredRuntime element. This is for 1.0 apps only. */
-		if (app_config->required_runtime != NULL) {
-			const MonoRuntimeInfo* runtime = get_runtime_by_version (app_config->required_runtime);
-			if (runtime != NULL)
-				runtimes = g_slist_prepend (runtimes, (gpointer)runtime);
-			app_config_free (app_config);
-			return runtimes;
-		}
-		app_config_free (app_config);
-	}
-	
 	/* Look for a runtime with the exact version */
 	image = mono_assembly_open_from_bundle (mono_domain_default_alc (mono_domain_get ()), file, NULL, NULL);