X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=cgi%2Fcgi_blerg.c;h=83dd53d1b58506091d1d74416b00b6de7a8ad2c6;hb=6ce5fb7ab6e31f76e57639e4d04e32af33e77ee6;hp=d0dcdbaa7393f75140eba5af3f7cff9ceb886e07;hpb=bd39b527b12337f388e45410b86d223d4cdb16b0;p=blerg.git

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index d0dcdba..83dd53d 100644
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -6,40 +6,12 @@
 #include "database.h"
 #include "tags.h"
 #include "auth.h"
+#include "canned_responses.h"
 #include "app.h"
 #include "config.h"
 
 yajl_gen_config yajl_c = { 0, 0 };
 
-void respond_simple_data(unsigned const char *data, int len) {
-	printf("Content-length: %d\r\n\r\n", len);
-	fwrite(data, len, 1, stdout);
-}
-
-void respond_404() {
-	printf("Status: 404 Not Found\r\n");
-	printf("Content-type: text/html\r\n");
-	printf("Content-length: %d\r\n\r\n", strlen(CONTENT_404));
-
-	printf(CONTENT_404);
-}
-
-void respond_405() {
-	printf("Status: 405 Method Not Allowed\r\n");
-	printf("Content-type: text/html\r\n");
-	printf("Content-length: %d\r\n\r\n", strlen(CONTENT_405));
-
-	printf(CONTENT_405);
-}
-
-void respond_JSON_Failure() {
-	respond_simple_data(JSON_FAILURE, strlen(JSON_FAILURE));
-}
-
-void respond_JSON_Success() {
-	respond_simple_data(JSON_SUCCESS, strlen(JSON_SUCCESS));
-}
-
 void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
 	const unsigned char *ybuf;
 	unsigned int len;
@@ -98,7 +70,7 @@ void respond_taglist(struct tag *results, int i) {
 
 	yajl_gen_array_close(g);
 	yajl_gen_get_buf(g, &ybuf, &len);
-	write(ybuf, len, 1, stdout);
+	fwrite(ybuf, len, 1, stdout);
 	yajl_gen_free(g);
 }
 
@@ -118,6 +90,10 @@ int main(int argc, char *argv[]) {
 		exit(0);
 	}
 	request_method = getenv("REQUEST_METHOD");
+	if (request_method == NULL) {
+		fprintf(stderr, "Request method is null!?\n");
+		exit(0);
+	}
 
 	if (strncmp(path, "/get", 4) == 0 && strlen(path) > 4) {
 		if (strncmp(request_method, "GET", 4) != 0) {
@@ -183,6 +159,8 @@ int main(int argc, char *argv[]) {
 			exit(0);
 		}
 
+		if (info.author[0] == 'H')
+			info.author[0] = '#';
 		if (!tag_exists(info.author)) {
 			respond_404();
 			exit(0);
@@ -273,7 +251,7 @@ int main(int argc, char *argv[]) {
 
 		printf("Content-type: application/json\r\n");
 		printf("Content-length: %d\r\n\r\n", len);
-		write(ybuf, len, 1, stdout);
+		fwrite(ybuf, len, 1, stdout);
 
 		yajl_gen_free(g);
 	} else if (strncmp(path, "/create", 8) == 0) {