| -rw-r--r-- | shared.c | 62 |
1 files changed, 36 insertions, 26 deletions
@@ -563,39 +563,49 @@ char *expand_macros(const char *txt) char *get_mimetype_for_filename(const char *filename) { - char *ext, *mimetype, *token, line[1024]; - FILE *file; + static const char *delimiters; + char *ext = NULL, *iterate, *mimetype = NULL, *token; + char line[1024]; + FILE *fd; struct string_list_item *mime; - if (!filename) + if (filename == NULL) return NULL; ext = strrchr(filename, '.'); - if (!ext) - return NULL; - ++ext; - if (!ext[0]) - return NULL; - mime = string_list_lookup(&ctx.cfg.mimetypes, ext); - if (mime) - return xstrdup(mime->util); - if (!ctx.cfg.mimetype_file) - return NULL; - file = fopen(ctx.cfg.mimetype_file, "r"); - if (!file) - return NULL; - while (fgets(line, sizeof(line), file)) { - if (!line[0] || line[0] == '#') - continue; - mimetype = strtok(line, " \t\r\n"); - while ((token = strtok(NULL, " \t\r\n"))) { - if (!strcasecmp(ext, token)) { - fclose(file); - return xstrdup(mimetype); + 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(file); - return NULL; + + return mimetype; } |