| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | shared.c | 57 | ||||
| -rw-r--r-- | ui-plain.c | 28 |
3 files changed, 47 insertions, 40 deletions
@@ -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_for_filename(const char *filename); +extern char *get_mimetype_from_file(const char *filename, const char *ext); #endif /* CGIT_H */ @@ -561,51 +561,42 @@ char *expand_macros(const char *txt) return result; } -char *get_mimetype_for_filename(const char *filename) +char *get_mimetype_from_file(const char *filename, const char *ext) { static const char *delimiters; - char *ext = NULL, *iterate, *mimetype = NULL, *token; - char line[1024]; + char *result; FILE *fd; - struct string_list_item *mime; + char line[1024]; + char *mimetype; + char *token; - if (filename == NULL) + if (!filename) return NULL; - 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; + fd = fopen(filename, "r"); + if (!fd) + return NULL; - delimiters = " \t\r\n"; + delimiters = " \t\r\n"; + result = NULL; - /* loop over all lines in the file */ - while (mimetype == NULL && fgets(line, sizeof(line), fd)) { - iterate = strtok(line, delimiters); + /* 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 (iterate == NULL || (iterate[0] == '#')) - continue; + /* 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) == 0) { - mimetype = xstrdup(iterate); - break; - } - } + /* loop over all extensions of mimetype */ + while ((token = strtok(NULL, delimiters))) { + if (!strcasecmp(ext, token)) { + result = xstrdup(mimetype); + break; } - fclose(fd); } } + fclose(fd); - return mimetype; + return result; } @@ -19,8 +19,10 @@ struct walk_tree_context { static int print_object(const unsigned char *sha1, const char *path) { enum object_type type; - char *buf, *mimetype; + char *buf, *ext; unsigned long size; + struct string_list_item *mime; + int freemime; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { @@ -33,10 +35,22 @@ static int print_object(const unsigned char *sha1, const char *path) cgit_print_error_page(404, "Not found", "Not found"); return 0; } - - mimetype = get_mimetype_for_filename(path); - ctx.page.mimetype = mimetype; - + 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; + } + } + } if (!ctx.page.mimetype) { if (buffer_is_binary(buf, size)) { ctx.page.mimetype = "application/octet-stream"; @@ -50,7 +64,9 @@ 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); - free(mimetype); + /* If we allocated this, then casting away const is safe. */ + if (freemime) + free((char*) ctx.page.mimetype); return 1; } |