Rewrote tokenization code

Makefile

@@ -2,7 +2,7 @@ SRC = $(wildcard src/*.c)
 OBJ = $(subst .c,.o,$(subst src,work,$(SRC)))
 LIBS = gnutls
 LDFLAGS = -pie -lrt -ldl $(shell pkg-config --libs $(LIBS))
-CFLAGS := -O2 -pipe -Wall -Wpedantic -Wshadow -ansi -D_XOPEN_SOURCE=500
+CFLAGS := -O2 -pipe -Wall -Wpedantic -Wshadow -ansi -D_XOPEN_SOURCE=500 -ggdb
 CFLAGS += -Isrc/ -fpie -D_POSIX_C_SOURCE=200809L $(shell pkg-config --cflags $(LIBS))
 INSTALLDIR := /usr/sbin
 HEADERDIR := /usr/include/

documentation/sitefiles.md

@@ -9,6 +9,15 @@ sitefiles consist of commands, which are of the form
 
 sitefiles also allow comments with #
 
+Actions and arguments are made of tokens. A token is some text surrounded by
+whitespace, where backslashes are always escaped literally.
+
+For example:
+
+`token` -> `"token"`
+`token\ with\ escapes` -> 'token with escapes'
+`token\\with\\backslashes` -> 'token\with\backslashes'
+
 # Part 2: Commands
 
 * ```set [variable] [value]``` - sets some local variable for the following

src/responseutil.c

@@ -128,6 +128,8 @@ int sendErrorResponse(Stream *stream, const char *error) {
 	int ret;
 	int len = snprintf(NULL, 0, template, error);
 	char *response = malloc(len + 1);
+	if (response == NULL)
+		return 1;
 	sprintf(response, template, error);
 	ret = sendStringResponse(stream, error, response,
 			"Content-Type: text/html\r\n", NULL);
@@ -185,6 +187,8 @@ int sendPipe(Stream *stream, const char *status, int fd, ...) {
 	size_t responseLen = 0;
 	char *response = malloc(allocResponse);
 	va_list ap;
+	if (response == NULL)
+		goto error;
 	for (;;) {
 		ssize_t len;
 		if (responseLen >= allocResponse) {

src/sitefile.c

@@ -33,145 +33,109 @@
  * good.
  * */
 
+
 typedef enum {
-	SUCCESS,
+	ARG,
 	LINE_END,
 	FILE_END,
-	ERROR
-} ReturnCode;
-/* this isn't ideal, but it's necessary to avoid namespace collisions. */
+	TOKEN_ERROR
+} TokenType;
 
-static void freeTokens(int argc, char **argv) {
+typedef struct {
+	TokenType type;
+	char *data;
+} Token;
+
+typedef enum {
+	NORMAL,
+	PAST_END,
+	COMMAND_ERROR
+} CommandType;
+
+static void freecommand(int argc, char **argv) {
 	int i;
 	for (i = 0; i < argc; i++)
 		free(argv[i]);
 	free(argv);
 }
 
-static ReturnCode getToken(FILE *file, char **ret) {
-	typedef enum {
-		QUOTED,
-		NONQUOTED
-	} TokenType;
-	TokenType type;
-	size_t allocatedLen = 50;
-	size_t len;
-
-	for (;;) {
-		int c = fgetc(file);
-		if (c == '\n')
-			return LINE_END;
-		if (c == EOF)
-			return FILE_END;
-		if (c == '#') {
-			while (c != '\n')
-				c = fgetc(file);
-			return LINE_END;
-		}
-		if (!isspace(c)) {
-			if (c == '"')
-				type = QUOTED;
-			else {
-				type = NONQUOTED;
-				ungetc(c, file);
-			}
-			break;
-		}
-	}
-
-	*ret = malloc(allocatedLen);
-
-	for (len = 0;; len++) {
+static void gettoken(FILE *file, Token *ret) {
 	int c;
-		if (len >= allocatedLen) {
-			char *newret;
-			allocatedLen *= 2;
-			newret = realloc(*ret, allocatedLen);
-			if (newret == NULL)
-				goto error;
-			*ret = newret;
+	char *data;
+	size_t len;
+	size_t alloc;
+	for (;;) {
+		c = fgetc(file);
+		switch (c) {
+		case '\n':
+			ret->type = LINE_END;
+			return;
+		case EOF:
+			ret->type = FILE_END;
+			return;
+		case ' ': case '\t':
+			continue;
+		}
+		ret->type = ARG;
+		ungetc(c, file);
+		break;
+	}
+
+	alloc = 20;
+	data = xmalloc(alloc);
+	for (len = 0;; ++len) {
+		if (len >= alloc) {
+			alloc *= 2;
+			data = xrealloc(data, alloc);
 		}
 		c = fgetc(file);
-		switch (type) {
-			case QUOTED:
-				if (c == '"')
-					goto gotToken;
-				break;
-			case NONQUOTED:
-				if (isspace(c)) {
-					ungetc(c, file);
-					goto gotToken;
-				}
-				break;
+		if (isspace(c) || c == EOF) {
+			data[len] = '\0';
+			ret->type = ARG;
+			ret->data = data;
+			return;
 		}
 		switch (c) {
 		case '\\':
 			c = fgetc(file);
-				if (c == EOF)
-					goto error;
-				break;
-			case EOF:
-				if (type == NONQUOTED)
-					goto gotToken;
-				goto error;
+			if (c == EOF) {
+				ret->type = TOKEN_ERROR;
+				return;
+			}
+		default:
+			data[len] = c;
 		}
-		(*ret)[len] = c;
 	}
-gotToken:
-	(*ret)[len] = '\0';
-	return SUCCESS;
-error:
-	free(*ret);
-	return ERROR;
 }
 
-static ReturnCode getCommand(FILE *file, int *argcret, char ***argvret) {
-/* THIS FUNCTION WILL NOT RETURN LINE_END */
-	int argc;
+static CommandType getcommand(FILE *file, int *argcret, char ***argvret) {
+	int argc, argalloc;
 	char **argv;
-	int allocatedTokens;
-	if (feof(file))
-		return FILE_END;
-	argc = 0;
-	allocatedTokens = 5;
-	argv = malloc(allocatedTokens * sizeof(*argv));
-	for (;;) {
-		ReturnCode code;
-		if (argc >= allocatedTokens) {
-			char **newargv;
-			allocatedTokens *= 2;
-			newargv = realloc(argv,
-			      allocatedTokens * sizeof(char *));
-			if (newargv == NULL)
-				goto error;
-			argv = newargv;
-		}
-		code = getToken(file, argv + argc);
+	argalloc = 5;
+	argv = xmalloc(argalloc * sizeof *argv);
 
-		switch (code) {
-			case ERROR:
-				goto error;
-			case LINE_END:
-				if (argc == 0)
-					continue;
-				/* We allow empty lines */
-				/* fallthrough */
-			case FILE_END:
-				if (argc == 0) {
-					free(argv);
-					return FILE_END;
+	for (argc = 0;; ++argc) {
+		Token token;
+		if (argc >= argalloc) {
+			argalloc *= 2;
+			argv = xrealloc(argv, argalloc * sizeof *argv);
 		}
+		gettoken(file, &token);
+		switch (token.type) {
+		case FILE_END:
+			if (argc == 0)
+				return PAST_END;
+		case LINE_END:
 			*argcret = argc;
 			*argvret = argv;
-				return SUCCESS;
-			case SUCCESS:
-				argc++;
+			return NORMAL;
+		case ARG:
+			argv[argc] = token.data;
 			break;
+		case TOKEN_ERROR:
+			return COMMAND_ERROR;
 		}
 	}
-error:
-	freeTokens(argc, argv);
-	return ERROR;
 }
 
 static char *getport(char *data, unsigned short *ret) {
@@ -247,10 +211,11 @@ Sitefile *parseSitefile(char *path) {
 	contenttype = xstrdup("text/html");
 
 	for (;;) {
-		ReturnCode status = getCommand(file, &argc, &argv);
-		switch (status) {
 		int i;
-			case FILE_END:
+		CommandType commandtype;
+		commandtype = getcommand(file, &argc, &argv);
+		switch (commandtype) {
+		case PAST_END:
 			free(ports);
 			for (i = 0; i < ret->portcount; ++i) {
 				Port *port = ret->ports + i;
@@ -258,15 +223,17 @@ Sitefile *parseSitefile(char *path) {
 					(port->key == NULL ||
 					 port->cert == NULL)) {
 					fprintf(stderr,
-"Port %hu declared as TLS without proper TLS files\n", port->num);
+"Port %hu declarS without proper TLS files\n", port->num);
 					goto nterror;
 				}
 			}
+			free(contenttype);
+			free(host);
 			fclose(file);
 			return ret;
-			case ERROR: case LINE_END:
+		case COMMAND_ERROR:
 			goto nterror;
-			case SUCCESS:
+		case NORMAL:
 			break;
 		}
 		if (strcmp(argv[0], "set") == 0) {
@@ -315,7 +282,6 @@ Sitefile *parseSitefile(char *path) {
 		}
 		else if (strcmp(argv[0], "declare") == 0) {
 			Port newport;
-			int i;
 			if (argc < 3) {
 				fputs(
 "Usage: declare [transport] [port]\n", stderr);
@@ -354,7 +320,6 @@ Sitefile *parseSitefile(char *path) {
 		}
 #define PORT_ATTRIBUTE(name, func) \
 		else if (strcmp(argv[0], #name) == 0) { \
-			int i; \
 			unsigned short port; \
 			if (argc < 3) { \
 				fputs("Usage: " #name " [" #name "] [port]\n", \
@@ -414,7 +379,7 @@ Sitefile *parseSitefile(char *path) {
 			fprintf(stderr, "Unknown sitefile command %s", argv[0]);
 			goto error;
 		}
-		freeTokens(argc, argv);
+		freecommand(argc, argv);
 		ret->content[ret->size].respondto = respondto;
 		if (host == NULL)
 			regcomp(&ret->content[ret->size].host, ".*", cflags);
@@ -431,7 +396,7 @@ Sitefile *parseSitefile(char *path) {
 		ret->size++;
 	}
 error:
-	freeTokens(argc, argv);
+	freecommand(argc, argv);
 nterror:
 	freeSitefile(ret);
 	return NULL;
@@ -439,11 +404,20 @@ nterror:
 
 void freeSitefile(Sitefile *site) {
 	long i;
-	for (i = 0; i < site->size; i++) {
+	for (i = 0; i < site->size; ++i) {
 		regfree(&site->content[i].path);
 		regfree(&site->content[i].host);
+		/* This doesn't break because free(NULL) is harmless. */
+
 		free(site->content[i].arg);
+		free(site->content[i].ports);
+		free(site->content[i].contenttype);
 	}
 	free(site->content);
+	for (i = 0; i < site->portcount; ++i) {
+		free(site->ports[i].key);
+		free(site->ports[i].cert);
+	}
+	free(site->ports);
 	free(site);
 }