cgit.c: remove useless null check

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 0daa7bf062db66683f9e7ae107feb20f07973183..0dd1a8b9129b2ffcdc983d300f83e2ab066e6432 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -16,53 +16,11 @@ 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;
-       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) {
@@ -75,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";
@@ -104,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;
 }