diff options
author | Christian Hesse | 2015-08-16 14:53:52 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2015-08-17 14:25:08 +0200 |
commit | aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca (patch) | |
tree | fc3118e65804d0dcc206e8d39fd55a76f9b3b9d2 /shared.c | |
parent | f5c83d7b5ddceb03e1c6bda2e43c48500c7da9f5 (diff) | |
download | cgit-aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca.tar cgit-aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca.tar.gz cgit-aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca.zip |
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>
Diffstat (limited to 'shared.c')
-rw-r--r-- | shared.c | 65 |
1 files changed, 37 insertions, 28 deletions
@@ -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; } |