FreeStrBuf(&(*Url)->URL);
FreeStrBuf(&(*Url)->UrlWithoutCred);
FreeStrBuf(&(*Url)->CurlCreds);
+ FreeStrBuf(&(*Url)->UsrName);
+ FreeStrBuf(&(*Url)->Password);
if ((*Url)->Next != NULL)
FreeURL(&(*Url)->Next);
free(*Url);
*/
int ParseURL(ParsedURL **Url, StrBuf *UrlStr, unsigned short DefaultPort)
{
- const char *pch, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
+ const char *pch, *pPort, *pCredEnd, *pUserEnd;
ParsedURL *url = (ParsedURL *)malloc(sizeof(ParsedURL));
memset(url, 0, sizeof(ParsedURL));
*/
url->URL = NewStrBufDup(UrlStr);
url->Host = pch = ChrPtr(url->URL);
- pEndHost = url->LocalPart = strchr(pch, '/');
+ url->LocalPart = strchr(pch, '/');
if (url->LocalPart != NULL) {
if ((*(url->LocalPart + 1) == '/') &&
(*(url->LocalPart - 1) == ':')) { /* TODO: find default port for this protocol... */
url->Host = url->LocalPart + 2;
- pEndHost = url->LocalPart = strchr(url->Host, '/');
+ url->LocalPart = strchr(url->Host, '/');
if (url->LocalPart != NULL)
{
StrBufPeek(url->URL, url->LocalPart, 0, '\0');
}
}
if (url->LocalPart == NULL) {
- pEndHost = url->LocalPart = ChrPtr(url->URL) + StrLength(url->URL);
+ url->LocalPart = ChrPtr(url->URL) + StrLength(url->URL);
}
pCredEnd = strrchr(ChrPtr(url->URL), '@');
StrBufPeek(url->URL, pUserEnd, 0, '\0');
StrBufPeek(url->URL, pCredEnd, 0, '\0');
}
+ else
+ pUserEnd = NULL;
pPort = NULL;
if (*url->Host == '[') {
+ const char *pEndHost;
url->Host ++;
pEndHost = strchr(url->Host, ']');
if (pEndHost == NULL) {
((struct sockaddr_in *)&(url->Addr))->sin_port = htons(url->Port);
((struct sockaddr_in *)&(url->Addr))->sin_family = AF_INET;
}
- }
+ }
+
+ if (url->User != NULL) {
+ url->UsrName = NewStrBufPlain(url->User, pUserEnd - url->User);
+ StrBufUnescape(url->UsrName, 0);
+ url->User = ChrPtr(url->UsrName);
+ }
+
+ if (url->Pass != NULL) {
+ url->Password = NewStrBufPlain(url->Pass, pCredEnd - url->Pass);
+ StrBufUnescape(url->Password, 0);
+ url->Pass = ChrPtr(url->Password);
+ }
+
+ if (*Url != NULL)
+ url->Next = *Url;
*Url = url;
return 1;
}