2 files changed, 39 insertions, 7 deletions

diff --git a/http.c b/http.c
index 41a0435..fb536c8 100644
--- a/http.c
+++ b/http.c
@@ -8,18 +8,47 @@
 
 struct http_request http_parse_request(const char *reqstr)
 {
-	struct http_request req;
 	char uribuf[CFWS_MAXURI];
-	size_t urilen;
+	size_t urilen = 0, query_len = 0;
+	const char *counter;
+
+	struct http_request req;
+	req.method    = HTTP_METHOD_GET;
+	req.uri       = NULL;
+	req.query_str = NULL;
 
-	sscanf(reqstr, "GET %s HTTP/1.1", uribuf);
+	/* TODO: Support other request methods such as POST */
+	if (strncmp(reqstr, "GET ", 4) != 0) {
+		fprintf(stderr, "Unhandled request type: %s\n", reqstr);
+		return req;
+	}
 
-	/* TODO: Support other method types, notably POST */
-	req.method = HTTP_METHOD_GET;
+	counter = reqstr + 4;
+	while (*counter != ' ' && *counter != '?' && *counter != 0
+			&& urilen < CFWS_MAXURI) {
+		uribuf[urilen++] = *counter;
+		++counter;
+	}
 
-	urilen = strlen(uribuf);
 	req.uri = malloc(urilen + 1);
-	memcpy(req.uri, uribuf, urilen + 1);
+	memcpy(req.uri, uribuf, urilen);
+	req.uri[urilen] = '\0';
+
+	/* Parse the query string if one exists. */
+	if (*counter == '?') {
+		/* Skip the question mark at the beginning. */
+		counter++;
+
+		while (*counter != ' ' && *counter != 0
+				&& query_len < CFWS_MAXURI) {
+			uribuf[query_len++] = *counter;
+			++counter;
+		}
+
+		req.query_str = malloc(query_len + 1);
+		memcpy(req.query_str, uribuf, query_len);
+		req.query_str[query_len] = '\0';
+	}
 	
 	/* TODO: Parse request headers */
 
@@ -29,6 +58,8 @@ struct http_request http_parse_request(const char *reqstr)
 void http_free_request(struct http_request *req)
 {
 	free(req->uri);
+	if (req->query_str)
+		free(req->query_str);
 }
 
 static const char *response_msg[2] = {
diff --git a/http.h b/http.h
index 3cdc062..89576f6 100644
--- a/http.h
+++ b/http.h
@@ -18,6 +18,7 @@ enum http_res_code {
 struct http_request {
 	int method;
 	char *uri;
+	char *query_str;
 };
 
 struct http_request http_parse_request(const char *);