markusfisch · Dec 14, 2024 · Dec 28, 2024
Showing with 122 additions and 100 deletions.

+0 −15 Makefile

+91 −85 README.md

0 { → include}/http.h

+30 −0 meson.build

+1 −0 meson.options

0 { → src}/http.c

0 test/meson.build
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -22,121 +22,127 @@ Sample
 For a simple GET request you just need to call http_request() and
 http_response():
 
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <unistd.h>
+```c
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
-	#include "http.h"
+#include "http.h"
 
-	int main(int argc, char **argv) {
-		int sd;
-		struct http_message msg;
+int main(int argc, char **argv) {
+	int sd;
+	struct http_message msg;
 
-		if (!--argc || (sd = http_request(*++argv)) < 1) {
-			perror("http_request");
-			return -1;
-		}
+	if (!--argc || (sd = http_request(*++argv)) < 1) {
+		perror("http_request");
+		return -1;
+	}
 
-		memset(&msg, 0, sizeof(msg));
+	memset(&msg, 0, sizeof(msg));
 
-		while (http_response(sd, &msg) > 0) {
-			if (msg.content) {
-				write(1, msg.content, msg.length);
-			}
+	while (http_response(sd, &msg) > 0) {
+		if (msg.content) {
+			write(1, msg.content, msg.length);
 		}
+	}
 
-		close(sd);
-
-		if (msg.header.code != 200) {
-			fprintf(
-				stderr,
-				"error: returned HTTP code %d\n",
-				msg.header.code);
-		}
+	close(sd);
 
-		return 0;
+	if (msg.header.code != 200) {
+		fprintf(
+			stderr,
+			"error: returned HTTP code %d\n",
+			msg.header.code);
 	}
 
+	return 0;
+}
+```
+
 ### Custom request
 
 If you want to add/tweak some header values or do a POST request, use the low level functions http_parse_url(), http_connect() and http_send() to compose your request like this:
 
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <unistd.h>
-
-	#include "http.h"
-
-	int post(int sd, struct http_url *url) {
-		char buf[1024];
-
-		snprintf(
-			buf,
-			sizeof(buf),
-			"\
-	POST /%s HTTP/1.1\r\n\
-	User-Agent: Mozilla/4.0 (Linux)\r\n\
-	Host: %s\r\n\
-	Accept: */*\r\n\
-	Content-Length: 13\r\n\
-	Connection: close\r\n\
-	\r\n\
-	q=Test&btn=Go\r\n\
-	\r\n",
-			url->query,
-			url->host);
-
-		if (http_send(sd, buf)) {
-			perror("http_send");
-			return -1;
-		}
-
-		return 0;
+```c
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "http.h"
+
+int post(int sd, struct http_url *url) {
+	char buf[1024];
+
+	snprintf(
+		buf,
+		sizeof(buf),
+		"\
+POST /%s HTTP/1.1\r\n\
+User-Agent: Mozilla/4.0 (Linux)\r\n\
+Host: %s\r\n\
+Accept: */*\r\n\
+Content-Length: 13\r\n\
+Connection: close\r\n\
+\r\n\
+q=Test&btn=Go\r\n\
+\r\n",
+		url->query,
+		url->host);
+
+	if (http_send(sd, buf)) {
+		perror("http_send");
+		return -1;
 	}
 
-	int main(int argc, char **argv) {
-		struct http_url *url;
-		struct http_message msg;
-		int sd;
+	return 0;
+}
 
-		if (!(url = http_parse_url(*++argv)) ||
-				!(sd = http_connect(url))) {
-			free(url);
-			perror("http_connect");
-			return -1;
-		}
+int main(int argc, char **argv) {
+	struct http_url *url;
+	struct http_message msg;
+	int sd;
+
+	if (!(url = http_parse_url(*++argv)) ||
+			!(sd = http_connect(url))) {
+		free(url);
+		perror("http_connect");
+		return -1;
+	}
 
-		memset(&msg, 0, sizeof(msg));
+	memset(&msg, 0, sizeof(msg));
 
-		if (!post(sd, url)) {
-			while (http_response(sd, &msg) > 0) {
-				if (msg.content) {
-					write(1, msg.content, msg.length);
-				}
+	if (!post(sd, url)) {
+		while (http_response(sd, &msg) > 0) {
+			if (msg.content) {
+				write(1, msg.content, msg.length);
 			}
 		}
+	}
 
-		free(url);
-		close(sd);
-
-		if (msg.header.code != 200) {
-			fprintf(
-				stderr,
-				"error: returned HTTP code %d\n",
-				msg.header.code);
-		}
+	free(url);
+	close(sd);
 
-		return 0;
+	if (msg.header.code != 200) {
+		fprintf(
+			stderr,
+			"error: returned HTTP code %d\n",
+			msg.header.code);
 	}
 
+	return 0;
+}
+```
+
 Testing
 -------
 
 There's a bash script to test any URL list against libhttp:
 
-	$ cd test && bash test.sh [FILE-WITH-URLS]
+```bash
+$ cd test && bash test.sh [FILE-WITH-URLS]
+```
 
 If you find bugs, please report them.
 

diff --git a/http.h → include/http.h b/http.h → include/http.h
diff --git a/meson.build b/meson.build
@@ -0,0 +1,30 @@
+project('http', 'c', version: '1.0.0')
+
+src = files('./src/http.c')
+
+include_dir = include_directories('./include')
+
+http = library(
+    'http',
+    src,
+    include_directories: [include_dir],
+    install: not meson.is_subproject(),
+)
+http_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: http,
+)
+
+pkg_mod = import('pkgconfig')
+
+pkg_mod.generate(
+    http,
+    name: 'http',
+    description: 'Simple http client',
+    libraries: http,
+    version: meson.project_version(),
+)
+
+if get_variable('tests')
+    subdir('./test')
+endif
diff --git a/meson.options b/meson.options
@@ -0,0 +1 @@
+option('tests', type: 'boolean', value: true)
diff --git a/http.c → src/http.c b/http.c → src/http.c
diff --git a/test/meson.build b/test/meson.build