comparison src/util.c @ 9341:cf5b5b63228d

[gaim-migrate @ 10149] rizzo, with i think some help from wing, who approves this patch, fixed an issue with his previous patch, where basicly gaim_url_fetch would fail on a link like http://foo.bar/blah@blah because it mistook the foo.bar/blah@ part for a user name. The most notable thing this fixes is Get Info on MSN people, which wing's earlier patch made pretty cool, except for the not working part due to rizzo's earlier patch. So everyone Get Info on their msn buddies and oooh and aaah at the pictures and stuff. committer: Tailor Script <[e-mail]>

9340:7fa8eff579b5

}

/**************************************************************************
 * URI/URL Functions
 **************************************************************************/
/*
 * Would be nice when dissecting an environmental variable
 * that specifies proxy information.
 */
gboolean
gaim_url_parse(const char *url, char **ret_host, int *ret_port,
			   char **ret_path, char **ret_user, char **ret_passwd)
{
	char scan_info[255];
	char port_str[6];
	int f;
	const char *at;
	const char *turl;
	char host[256], path[256], user[256], passwd[256];
	int port = 0;
	/* hyphen at end includes it in control set */
	static char addr_ctrl[] = "A-Za-z0-9.-";

		turl += 7;
		url = turl;
	}

	/* parse out authentication information if supplied */
	if ((at = strchr(url, '@')) != NULL) {
		g_snprintf(scan_info, sizeof(scan_info),
					"%%255[%s]:%%255[%s]^@", user_ctrl, passwd_ctrl);
		f = sscanf(url, scan_info, user, passwd);

		if (f ==1 ) {

9341:cf5b5b63228d

}

/**************************************************************************
 * URI/URL Functions
 **************************************************************************/
gboolean
gaim_url_parse(const char *url, char **ret_host, int *ret_port,
			   char **ret_path, char **ret_user, char **ret_passwd)
{
	char scan_info[255];
	char port_str[6];
	int f;
	const char *at, *slash;
	const char *turl;
	char host[256], path[256], user[256], passwd[256];
	int port = 0;
	/* hyphen at end includes it in control set */
	static char addr_ctrl[] = "A-Za-z0-9.-";

		turl += 7;
		url = turl;
	}

	/* parse out authentication information if supplied */
	/* Only care about @ char BEFORE the first / */
	at = strchr(url, '@');
	slash = strchr(url, '/');
	if ((at != NULL) &&
			(((slash != NULL) && (strlen(at) > strlen(slash))) ||
			(slash == NULL))) {
		g_snprintf(scan_info, sizeof(scan_info),
					"%%255[%s]:%%255[%s]^@", user_ctrl, passwd_ctrl);
		f = sscanf(url, scan_info, user, passwd);

		if (f ==1 ) {