refactor get_mimetype_from_file() to get_mimetype_for_filename()

* handle mimetype within a single function
* return allocated memory on success

Signed-off-by: Christian Hesse <mail@eworm.de>

3 files changed, 44 insertions, 51 deletions

diff --git a/cgit.h b/cgit.hindex 0f1e186..b7eccdd 100644--- a/cgit.h+++ b/cgit.h@@ -391,6 +391,6 @@ extern int readfile(const char *path, char **buf, size_t *size);  extern char *expand_macros(const char *txt); -extern char *get_mimetype_from_file(const char *filename, const char *ext);+extern char *get_mimetype_for_filename(const char *filename);  #endif /* CGIT_H */
diff --git a/cgit.h b/cgit.h
index 0f1e186..b7eccdd 100644
--- a/cgit.h
+++ b/cgit.h
@@ -391,6 +391,6 @@ extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);
 
-extern char *get_mimetype_from_file(const char *filename, const char *ext);
+extern char *get_mimetype_for_filename(const char *filename);
 
 #endif /* CGIT_H */
diff --git a/shared.c b/shared.cindex fb4e8ca..225ce15 100644--- a/shared.c+++ b/shared.c@@ -561,42 +561,51 @@ char *expand_macros(const char *txt) 	return result; } -char *get_mimetype_from_file(const char *filename, const char *ext)+char *get_mimetype_for_filename(const char *filename) { 	static const char *delimiters;-	char *result;-	FILE *fd;+	char *ext = NULL, *iterate, *mimetype = NULL, *token; 	char line[1024];-	char *mimetype;-	char *token;--	if (!filename)-		return NULL;+	FILE *fd;+	struct string_list_item *mime; -	fd = fopen(filename, "r");-	if (!fd)+	if (filename == NULL) 		return NULL; -	delimiters = " \t\r\n";-	result = NULL;--	/* loop over all lines in the file */-	while (!result && fgets(line, sizeof(line), fd)) {-		mimetype = strtok(line, delimiters);--		/* skip empty lines and comment lines */-		if (!mimetype || (mimetype[0] == '#'))-			continue;--		/* loop over all extensions of mimetype */-		while ((token = strtok(NULL, delimiters))) {-			if (!strcasecmp(ext, token)) {-				result = xstrdup(mimetype);-				break;+	ext = strrchr(filename, '.');++	if (ext && *(++ext)) {+		mime = string_list_lookup(&ctx.cfg.mimetypes, ext);+		if (mime) {+			/* We could just pass the pointer here, but would have to care+			 * whether or not to free the memory. Instead just dup. */+			mimetype = xstrdup(mime->util);+		} else if (ctx.cfg.mimetype_file != NULL) {+			fd = fopen(ctx.cfg.mimetype_file, "r");+			if (fd == NULL)+				return NULL;++			delimiters = " \t\r\n";++			/* loop over all lines in the file */+			while (mimetype == NULL && fgets(line, sizeof(line), fd)) {+				iterate = strtok(line, delimiters);++				/* skip empty lines and comment lines */+				if (iterate == NULL || (iterate[0] == '#'))+					continue;++				/* loop over all extensions of mimetype */+				while ((token = strtok(NULL, delimiters))) {+					if (strcasecmp(ext, token) == 0) {+						mimetype = xstrdup(iterate);+						break;+					}+				} 			}+			fclose(fd); 		} 	}-	fclose(fd); -	return result;+	return mimetype; }
diff --git a/shared.c b/shared.c
index fb4e8ca..225ce15 100644
--- a/shared.c
+++ b/shared.c
@@ -561,42 +561,51 @@ char *expand_macros(const char *txt)
 	return result;
 }
 
-char *get_mimetype_from_file(const char *filename, const char *ext)
+char *get_mimetype_for_filename(const char *filename)
 {
 	static const char *delimiters;
-	char *result;
-	FILE *fd;
+	char *ext = NULL, *iterate, *mimetype = NULL, *token;
 	char line[1024];
-	char *mimetype;
-	char *token;
-
-	if (!filename)
-		return NULL;
+	FILE *fd;
+	struct string_list_item *mime;
 
-	fd = fopen(filename, "r");
-	if (!fd)
+	if (filename == NULL)
 		return NULL;
 
-	delimiters = " \t\r\n";
-	result = NULL;
-
-	/* loop over all lines in the file */
-	while (!result && fgets(line, sizeof(line), fd)) {
-		mimetype = strtok(line, delimiters);
-
-		/* skip empty lines and comment lines */
-		if (!mimetype || (mimetype[0] == '#'))
-			continue;
-
-		/* loop over all extensions of mimetype */
-		while ((token = strtok(NULL, delimiters))) {
-			if (!strcasecmp(ext, token)) {
-				result = xstrdup(mimetype);
-				break;
+	ext = strrchr(filename, '.');
+
+	if (ext && *(++ext)) {
+		mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
+		if (mime) {
+			/* We could just pass the pointer here, but would have to care
+			 * whether or not to free the memory. Instead just dup. */
+			mimetype = xstrdup(mime->util);
+		} else if (ctx.cfg.mimetype_file != NULL) {
+			fd = fopen(ctx.cfg.mimetype_file, "r");
+			if (fd == NULL)
+				return NULL;
+
+			delimiters = " \t\r\n";
+
+			/* loop over all lines in the file */
+			while (mimetype == NULL && fgets(line, sizeof(line), fd)) {
+				iterate = strtok(line, delimiters);
+
+				/* skip empty lines and comment lines */
+				if (iterate == NULL || (iterate[0] == '#'))
+					continue;
+
+				/* loop over all extensions of mimetype */
+				while ((token = strtok(NULL, delimiters))) {
+					if (strcasecmp(ext, token) == 0) {
+						mimetype = xstrdup(iterate);
+						break;
+					}
+				}
 			}
+			fclose(fd);
 		}
 	}
-	fclose(fd);
 
-	return result;
+	return mimetype;
 }
diff --git a/ui-plain.c b/ui-plain.cindex d68518e..0dd1a8b 100644--- a/ui-plain.c+++ b/ui-plain.c@@ -19,10 +19,8 @@ struct walk_tree_context { static int print_object(const unsigned char *sha1, const char *path) { 	enum object_type type;-	char *buf, *ext;+	char *buf, *mimetype; 	unsigned long size;-	struct string_list_item *mime;-	int freemime;  	type = sha1_object_info(sha1, &size); 	if (type == OBJ_BAD) {@@ -35,22 +33,10 @@ static int print_object(const unsigned char *sha1, const char *path) 		cgit_print_error_page(404, "Not found", "Not found"); 		return 0; 	}-	ctx.page.mimetype = NULL;-	ext = strrchr(path, '.');-	freemime = 0;-	if (ext && *(++ext)) {-		mime = string_list_lookup(&ctx.cfg.mimetypes, ext);-		if (mime) {-			ctx.page.mimetype = (char *)mime->util;-			ctx.page.charset = NULL;-		} else {-			ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);-			if (ctx.page.mimetype) {-				freemime = 1;-				ctx.page.charset = NULL;-			}-		}-	}++	mimetype = get_mimetype_for_filename(path);+	ctx.page.mimetype = mimetype;+ 	if (!ctx.page.mimetype) { 		if (buffer_is_binary(buf, size)) { 			ctx.page.mimetype = "application/octet-stream";@@ -64,9 +50,7 @@ static int print_object(const unsigned char *sha1, const char *path) 	ctx.page.etag = sha1_to_hex(sha1); 	cgit_print_http_headers(); 	html_raw(buf, size);-	/* If we allocated this, then casting away const is safe. */-	if (freemime)-		free((char*) ctx.page.mimetype);+	free(mimetype); 	return 1; } 
diff --git a/ui-plain.c b/ui-plain.c
index d68518e..0dd1a8b 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -19,10 +19,8 @@ struct walk_tree_context {
 static int print_object(const unsigned char *sha1, const char *path)
 {
 	enum object_type type;
-	char *buf, *ext;
+	char *buf, *mimetype;
 	unsigned long size;
-	struct string_list_item *mime;
-	int freemime;
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {
@@ -35,22 +33,10 @@ static int print_object(const unsigned char *sha1, const char *path)
 		cgit_print_error_page(404, "Not found", "Not found");
 		return 0;
 	}
-	ctx.page.mimetype = NULL;
-	ext = strrchr(path, '.');
-	freemime = 0;
-	if (ext && *(++ext)) {
-		mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
-		if (mime) {
-			ctx.page.mimetype = (char *)mime->util;
-			ctx.page.charset = NULL;
-		} else {
-			ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
-			if (ctx.page.mimetype) {
-				freemime = 1;
-				ctx.page.charset = NULL;
-			}
-		}
-	}
+
+	mimetype = get_mimetype_for_filename(path);
+	ctx.page.mimetype = mimetype;
+
 	if (!ctx.page.mimetype) {
 		if (buffer_is_binary(buf, size)) {
 			ctx.page.mimetype = "application/octet-stream";
@@ -64,9 +50,7 @@ static int print_object(const unsigned char *sha1, const char *path)
 	ctx.page.etag = sha1_to_hex(sha1);
 	cgit_print_http_headers();
 	html_raw(buf, size);
-	/* If we allocated this, then casting away const is safe. */
-	if (freemime)
-		free((char*) ctx.page.mimetype);
+	free(mimetype);
 	return 1;
 }