Zander671/cse-130-http-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format stuff

Browse Source
This commit is contained in:
Alexander Rosenberg
2026-05-26 17:02:45 -07:00
parent ace7e4b05e
commit 1e81a75a8a
2 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.dir-locals.el
+5
View File
@@ -0,0 +1,5 @@
;;; Directory Local Variables -*- no-byte-compile: t -*-
;;; For more information see (info "(emacs) Directory Variables")
((nil . ((eval . (add-to-list (make-local-variable 'exec-path) "/usr/lib/llvm18/bin/"))))
(c-ts-base-mode . ((apheleia-formatter . clang-format))))
http.c
+38 -28
View File
@@ -5,10 +5,11 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
static const char *EMPTY_STRING = ""; static const char* EMPTY_STRING = "";
HTTPHeaderList *http_header_list_push(HTTPHeaderList *list, const char *key, const char *value) { HTTPHeaderList* http_header_list_push(HTTPHeaderList* list, const char* key, const char* value)
HTTPHeaderList *new = malloc(sizeof(HTTPHeaderList)); {
HTTPHeaderList* new = malloc(sizeof(HTTPHeaderList));
if (!new) { if (!new) {
return NULL; return NULL;
} }
@@ -31,9 +32,10 @@ HTTPHeaderList *http_header_list_push(HTTPHeaderList *list, const char *key, con
return new; return new;
} }
void free_http_header_list(HTTPHeaderList *list) { void free_http_header_list(HTTPHeaderList* list)
{
while (list) { while (list) {
HTTPHeaderList *next = list->next; HTTPHeaderList* next = list->next;
free(list->key); free(list->key);
free(list->value); free(list->value);
free(list); free(list);
@@ -41,7 +43,8 @@ void free_http_header_list(HTTPHeaderList *list) {
} }
} }
const char *http_header_list_search(HTTPHeaderList *list, const char *key, const char *def) { const char* http_header_list_search(HTTPHeaderList* list, const char* key, const char* def)
{
while (list) { while (list) {
if (strcmp(list->key, key) == 0) { if (strcmp(list->key, key) == 0) {
return list->value; return list->value;
@@ -51,21 +54,22 @@ const char *http_header_list_search(HTTPHeaderList *list, const char *key, const
return def; return def;
} }
#define MAX_REQUEST_LENGTH 16384 #define MAX_REQUEST_LENGTH 16384
#define MAX_METHOD_LENGTH 16 #define MAX_METHOD_LENGTH 16
#define MAX_URI_LENGTH 256 #define MAX_URI_LENGTH 256
#define MAX_VERSION_LENGTH 3 #define MAX_VERSION_LENGTH 3
#define MAX_HEADER_KEY_LENGTH 2048 #define MAX_HEADER_KEY_LENGTH 2048
#define MAX_HEADER_VALUE_LENGTH 2048 #define MAX_HEADER_VALUE_LENGTH 2048
#define RETURN_IF_READ_ERROR(s) \ #define RETURN_IF_READ_ERROR(s) \
if (ferror((s))) { \ if (ferror((s))) { \
return HRPR_READ_FAILED; \ return HRPR_READ_FAILED; \
} }
// if an error occured, req->uri is not allocated // if an error occured, req->uri is not allocated
static HTTPRequestParseResult parse_method_uri_line( static HTTPRequestParseResult parse_method_uri_line(
FILE *stream, size_t *restrict bytes_read, HTTPRequest *restrict req) { FILE* stream, size_t* restrict bytes_read, HTTPRequest* restrict req)
{
// allow for some leeway in passing incorrect methods // allow for some leeway in passing incorrect methods
char method[MAX_METHOD_LENGTH + 1]; char method[MAX_METHOD_LENGTH + 1];
char uri[MAX_URI_LENGTH + 1]; char uri[MAX_URI_LENGTH + 1];
@@ -73,7 +77,7 @@ static HTTPRequestParseResult parse_method_uri_line(
char whitespace[4]; char whitespace[4];
ssize_t signed_bytes_read; ssize_t signed_bytes_read;
#define S1(s) #s #define S1(s) #s
#define S(s) S1(s) #define S(s) S1(s)
int nconv = fscanf(stream, int nconv = fscanf(stream,
// clang-format off // clang-format off
"%" S(MAX_METHOD_LENGTH) "[A-Z]" "%" S(MAX_METHOD_LENGTH) "[A-Z]"
@@ -109,8 +113,9 @@ static HTTPRequestParseResult parse_method_uri_line(
// return true if there are more headers and no error occurred, false otherwise // return true if there are more headers and no error occurred, false otherwise
// this will *not* free LIST if an error occurs // this will *not* free LIST if an error occurs
static bool next_header(FILE *stream, size_t *restrict bytes_read, static bool next_header(FILE* stream, size_t* restrict bytes_read,
HTTPRequestParseResult *restrict res, HTTPHeaderList *restrict *restrict list) { HTTPRequestParseResult* restrict res, HTTPHeaderList* restrict* restrict list)
{
char c = fgetc(stream); char c = fgetc(stream);
RETURN_IF_READ_ERROR(stream); RETURN_IF_READ_ERROR(stream);
if (c == '\r') { if (c == '\r') {
@@ -130,7 +135,7 @@ static bool next_header(FILE *stream, size_t *restrict bytes_read,
char whitespace[3]; char whitespace[3];
ssize_t signed_bytes_read; ssize_t signed_bytes_read;
#define S1(s) #s #define S1(s) #s
#define S(s) S1(s) #define S(s) S1(s)
int nconv = fscanf(stream, int nconv = fscanf(stream,
// clang-format off // clang-format off
"%" S(MAX_HEADER_KEY_LENGTH) "[a-zA-Z0-9.-]" "%" S(MAX_HEADER_KEY_LENGTH) "[a-zA-Z0-9.-]"
@@ -154,7 +159,8 @@ static bool next_header(FILE *stream, size_t *restrict bytes_read,
return true; return true;
} }
HTTPRequestParseResult parse_http_request(FILE *stream, HTTPRequest *restrict out) { HTTPRequestParseResult parse_http_request(FILE* stream, HTTPRequest* restrict out)
{
out->uri = EMPTY_STRING; out->uri = EMPTY_STRING;
out->path = EMPTY_STRING; out->path = EMPTY_STRING;
out->method = EMPTY_STRING; out->method = EMPTY_STRING;
@@ -174,23 +180,26 @@ HTTPRequestParseResult parse_http_request(FILE *stream, HTTPRequest *restrict ou
return res; return res;
} }
void free_http_request(HTTPRequest *restrict req) { void free_http_request(HTTPRequest* restrict req)
{
if (req->method != EMPTY_STRING) { if (req->method != EMPTY_STRING) {
free((char *) req->method); free((char*)req->method);
} }
if (req->uri != EMPTY_STRING) { if (req->uri != EMPTY_STRING) {
free((char *) req->uri); free((char*)req->uri);
} }
free_http_header_list(req->headers); free_http_header_list(req->headers);
} }
const char *status_code_to_message(int status, size_t *restrict length) { const char* status_code_to_message(int status, size_t* restrict length)
{
static const struct { static const struct {
int code; int code;
const char *msg; const char* msg;
size_t size; size_t size;
} CODES[] = { } CODES[] = {
#define P(s, m) { s, m, sizeof(m) - 1 } #define P(s, m) \
{ s, m, sizeof(m) - 1 }
P(200, "OK"), P(200, "OK"),
P(201, "Created"), P(201, "Created"),
P(400, "Bad Request"), P(400, "Bad Request"),
@@ -213,12 +222,13 @@ const char *status_code_to_message(int status, size_t *restrict length) {
return NULL; return NULL;
} }
void format_http_response(FILE *stream, HTTPResponse *restrict resp) { void format_http_response(FILE* stream, HTTPResponse* restrict resp)
{
assert(status_code_to_message(resp->status, NULL)); assert(status_code_to_message(resp->status, NULL));
dprintf(fileno(stream), "HTTP/1.1 %d %s\r\n", resp->status, dprintf(fileno(stream), "HTTP/1.1 %d %s\r\n", resp->status,
status_code_to_message(resp->status, NULL)); status_code_to_message(resp->status, NULL));
dprintf(fileno(stream), "Content-Length: %zu\r\n", resp->body_length); dprintf(fileno(stream), "Content-Length: %zu\r\n", resp->body_length);
for (HTTPHeaderList *h = resp->headers; h; h = h->next) { for (HTTPHeaderList* h = resp->headers; h; h = h->next) {
write(fileno(stream), h->key, h->key_length); write(fileno(stream), h->key, h->key_length);
write(fileno(stream), ": ", 2); write(fileno(stream), ": ", 2);
write(fileno(stream), h->value, h->value_length); write(fileno(stream), h->value, h->value_length);