X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=input.cpp;h=102207f955deabdc8861ffbd9798fcefd1542e29;hb=refs%2Ftags%2F1.1.1;hp=0ee7d1ce918af18a9999a414cc9014a97ae07f7d;hpb=70c47a998c5aa2eb536c3c8f71f3178cd217a14d;p=cubemap

diff --git a/input.cpp b/input.cpp
index 0ee7d1c..102207f 100644
--- a/input.cpp
+++ b/input.cpp
@@ -37,10 +37,33 @@ bool parse_url(const string &url, string *protocol, string *user, string *host,
 	*protocol = string(url.begin(), url.begin() + split);
 
 	string rest = string(url.begin() + split + 3, url.end());
-	split = rest.find_first_of(":/");
-	if (split == string::npos) {
+
+	// Split at the first slash, or the first colon that's not within [].
+	bool within_brackets = false;
+	for (split = 0; split < rest.size(); ++split) {
+		if (rest[split] == '[') {
+			if (within_brackets) {
+				// Can't nest brackets.
+				return false;
+			}
+			within_brackets = true;
+		} else if (rest[split] == ']') {
+			if (!within_brackets) {
+				// ] without matching [.
+				return false;
+			}
+			within_brackets = false;
+		} else if (rest[split] == '/') {
+			break;
+		} else if (rest[split] == ':' && !within_brackets) {
+			break;
+		}
+	}
+
+	if (split == rest.size()) {
 		// http://foo
 		split_user_host(rest, user, host);
+		fprintf(stderr, "ooo user='%s' host='%s'\n", user->c_str(), host->c_str());
 		*port = *protocol;
 		*path = "/";
 		return true;