mime: rewrite detection function
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 17 Aug 2015 12:35:20 +0000 (14:35 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Mon, 17 Aug 2015 12:49:28 +0000 (14:49 +0200)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
shared.c

index 225ce1541ff723081fd73147e1dddfce7fb5dee7..3d91a76ec09c8a88aefa2d1148f3542aa6850565 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -563,49 +563,39 @@ char *expand_macros(const char *txt)
 
 char *get_mimetype_for_filename(const char *filename)
 {
-       static const char *delimiters;
-       char *ext = NULL, *iterate, *mimetype = NULL, *token;
-       char line[1024];
-       FILE *fd;
+       char *ext, *mimetype, *token, line[1024];
+       FILE *file;
        struct string_list_item *mime;
 
-       if (filename == NULL)
+       if (!filename)
                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 (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;
-                                       }
-                               }
+       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);
                        }
-                       fclose(fd);
                }
        }
-
-       return mimetype;
+       fclose(file);
+       return NULL;
 }