move get_mimetype_from_file() to shared

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

3 files changed, 42 insertions, 40 deletions

diff --git a/cgit.h b/cgit.hindex f327627..0f1e186 100644--- a/cgit.h+++ b/cgit.h@@ -391,4 +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);+ #endif /* CGIT_H */
diff --git a/cgit.h b/cgit.h
index f327627..0f1e186 100644
--- a/cgit.h
+++ b/cgit.h
@@ -391,4 +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);
+
 #endif /* CGIT_H */
diff --git a/shared.c b/shared.cindex 3bd2a9e..fb4e8ca 100644--- a/shared.c+++ b/shared.c@@ -560,3 +560,43 @@ char *expand_macros(const char *txt) 	} 	return result; }++char *get_mimetype_from_file(const char *filename, const char *ext)+{+	static const char *delimiters;+	char *result;+	FILE *fd;+	char line[1024];+	char *mimetype;+	char *token;++	if (!filename)+		return NULL;++	fd = fopen(filename, "r");+	if (!fd)+		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;+			}+		}+	}+	fclose(fd);++	return result;+}
diff --git a/shared.c b/shared.c
index 3bd2a9e..fb4e8ca 100644
--- a/shared.c
+++ b/shared.c
@@ -560,3 +560,43 @@ char *expand_macros(const char *txt)
 	}
 	return result;
 }
+
+char *get_mimetype_from_file(const char *filename, const char *ext)
+{
+	static const char *delimiters;
+	char *result;
+	FILE *fd;
+	char line[1024];
+	char *mimetype;
+	char *token;
+
+	if (!filename)
+		return NULL;
+
+	fd = fopen(filename, "r");
+	if (!fd)
+		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;
+			}
+		}
+	}
+	fclose(fd);
+
+	return result;
+}
diff --git a/ui-plain.c b/ui-plain.cindex 0daa7bf..d68518e 100644--- a/ui-plain.c+++ b/ui-plain.c@@ -16,46 +16,6 @@ struct walk_tree_context { 	int match; }; -static char *get_mimetype_from_file(const char *filename, const char *ext)-{-	static const char *delimiters;-	char *result;-	FILE *fd;-	char line[1024];-	char *mimetype;-	char *token;--	if (!filename)-		return NULL;--	fd = fopen(filename, "r");-	if (!fd)-		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;-			}-		}-	}-	fclose(fd);--	return result;-}- static int print_object(const unsigned char *sha1, const char *path) { 	enum object_type type;
diff --git a/ui-plain.c b/ui-plain.c
index 0daa7bf..d68518e 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -16,46 +16,6 @@ struct walk_tree_context {
 	int match;
 };
 
-static char *get_mimetype_from_file(const char *filename, const char *ext)
-{
-	static const char *delimiters;
-	char *result;
-	FILE *fd;
-	char line[1024];
-	char *mimetype;
-	char *token;
-
-	if (!filename)
-		return NULL;
-
-	fd = fopen(filename, "r");
-	if (!fd)
-		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;
-			}
-		}
-	}
-	fclose(fd);
-
-	return result;
-}
-
 static int print_object(const unsigned char *sha1, const char *path)
 {
 	enum object_type type;