X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;ds=sidebyside;f=cgi%2Fcgi_blerg.c;h=ee0672b4b360a6db648913b335f58bdcae0ea427;hb=3e3138025852408ef03f3213972e042e12841bed;hp=0a9998a92339530da024f419d8cfdcf3428ce57f;hpb=74ad5a3fea44e1ae4f142f9dee4e40c708721ed2;p=blerg.git

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index 0a9998a..ee0672b 100644
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -31,6 +31,16 @@ int check_auth(const char *username) {
 	return 1;
 }
 
+void respond_yajl(yajl_gen g) {
+	const unsigned char *ybuf;
+	unsigned int content_len;
+
+	yajl_gen_get_buf(g, &ybuf, &content_len);
+
+	printf("Content-type: application/json\r\n");
+	printf("Content-length: %d\r\n\r\n", content_len);
+	fwrite(ybuf, content_len, 1, stdout);
+}
 
 void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
 	const unsigned char *ybuf;
@@ -265,13 +275,7 @@ int main(int argc, char *argv[]) {
 		yajl_gen_string(g, (unsigned char *)number, strlen(number));
 		yajl_gen_map_close(g);
 
-		const unsigned char *ybuf;
-		unsigned int content_len;
-		yajl_gen_get_buf(g, &ybuf, &content_len);
-
-		printf("Content-type: application/json\r\n");
-		printf("Content-length: %d\r\n\r\n", content_len);
-		fwrite(ybuf, content_len, 1, stdout);
+		respond_yajl(g);
 
 		yajl_gen_free(g);
 	} else if (strncmp(path, "/create", 8) == 0) {
@@ -390,62 +394,60 @@ int main(int argc, char *argv[]) {
 		if (!check_auth(username))
 			exit(0);
 
-		yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
+		if (strncmp(request_method, "POST", 4) != 0) {
+			respond_405();
+			exit(0);
+		}
 
-		if (strncmp(request_method, "POST", 4) == 0) {
+		yajl_gen g;
+
+		if (path[7] == 0) {  /* No username */
 			const char *clear = cgi_getentrystr("clear");
 
-			if (strncmp(clear, "feed", 4) == 0) {
-				struct blerg *b = blerg_open(username);
-				blerg_set_subscription_mark(b);
-				blerg_close(b);
-				respond_JSON_Success();
-			} else if (strncmp(clear, "mentioned", 9) == 0) {
+			if (clear != NULL) {
 				struct blerg *b = blerg_open(username);
-				blerg_set_status(b, BLERGSTATUS_MENTIONED, 0);
+				if (strncmp(clear, "feed", 4) == 0) {
+					blerg_set_subscription_mark(b);
+				} else if (strncmp(clear, "mentioned", 9) == 0) {
+					blerg_set_status(b, BLERGSTATUS_MENTIONED, 0);
+				}
 				blerg_close(b);
 				respond_JSON_Success();
 			} else {
-				respond_JSON_Failure();
-			}
-			exit(0);
-		} else if (strncmp(request_method, "GET", 3) == 0) {
-			yajl_gen_map_open(g);
-			if (path[7] == 0) {
+				g = yajl_gen_alloc(&yajl_c, NULL);
+				yajl_gen_map_open(g);
+
 				struct blerg *b = blerg_open(username);
 				uint64_t subscription_mark = blerg_get_subscription_mark(b);
 				int mentioned = blerg_get_status(b, BLERGSTATUS_MENTIONED);
 				blerg_close(b);
 
-				yajl_gen_string(g, (unsigned char *)"feed_new", 7);
+				yajl_gen_string(g, (unsigned char *)"feed_new", 8);
 				yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
 
 				yajl_gen_string(g, (unsigned char *)"mentioned", 9);
 				yajl_gen_bool(g, mentioned);
+
+				yajl_gen_map_close(g);
+				respond_yajl(g);
+				yajl_gen_free(g);
+			}
+		} else {  /* with username */
+			g = yajl_gen_alloc(&yajl_c, NULL);
+			yajl_gen_map_open(g);
+
+			yajl_gen_string(g, (unsigned char *)"subscribed", 10);
+			ret = parse_url_info(path + 8, &info);
+			if ((ret & URL_INFO_NAME) == 1) {
+				yajl_gen_bool(g, is_subscribed(username, info.name));
 			} else {
-				yajl_gen_string(g, (unsigned char *)"subscribed", 10);
-				ret = parse_url_info(path + 8, &info);
-				if ((ret & URL_INFO_NAME) == 1) {
-					yajl_gen_bool(g, is_subscribed(username, info.name));
-				} else {
-					yajl_gen_bool(g, 0);
-				}
+				yajl_gen_bool(g, 0);
 			}
+
 			yajl_gen_map_close(g);
-		} else {
-			respond_405();
-			exit(0);
+			respond_yajl(g);
+			yajl_gen_free(g);
 		}
-
-		const unsigned char *ybuf;
-		unsigned int content_len;
-		yajl_gen_get_buf(g, &ybuf, &content_len);
-
-		printf("Content-type: application/json\r\n");
-		printf("Content-length: %d\r\n\r\n", content_len);
-		fwrite(ybuf, content_len, 1, stdout);
-
-		yajl_gen_free(g);
 	} else if (strncmp(path, "/passwd", 7) == 0) {
 		const char *username = cgi_getentrystr("username");
 		if (!check_auth(username))
@@ -469,4 +471,6 @@ int main(int argc, char *argv[]) {
 	}
 
 	cgi_quit();
+
+	return 0;
 }