move get_mimetype_from_file() to shared

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 3a2cb477ecd99e3ad317c0e72cfdbb98b34cb9d6..d68518e1771a7ed10c6b52d42dc5aaf9a469daf4 100644 (file)
--- 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;
@@ -66,13 +26,13 @@ static int print_object(const unsigned char *sha1, const char *path)
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");
                return 0;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");
                return 0;
        }
        ctx.page.mimetype = NULL;
@@ -225,12 +185,12 @@ void cgit_print_plain(void)
                rev = ctx.qry.head;
 
        if (get_sha1(rev, sha1)) {
-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {
-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");
                return;
        }
        if (!path_items.match) {
@@ -243,7 +203,7 @@ void cgit_print_plain(void)
                walk_tree_ctx.match_baselen = basedir_len(path_items.match);
        read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
        if (!walk_tree_ctx.match)
-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");
        else if (walk_tree_ctx.match == 2)
                print_dir_tail();
 }