refactor get_mimetype_from_file() to get_mimetype_for_filename()

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index fb4e8ca642d4b3c3f988b30f5c1487ad952edb44..225ce1541ff723081fd73147e1dddfce7fb5dee7 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -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;
 }