X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ee7eb520d247d457fe61bcbb0f1f009a889126ed..1ed08ad2184ac38d0a80e9a8146f378fb297c6a9:/sbr/mime_type.c

diff --git a/sbr/mime_type.c b/sbr/mime_type.c
index 0bfc3377..4e3ebbb7 100644
--- a/sbr/mime_type.c
+++ b/sbr/mime_type.c
@@ -20,10 +20,10 @@ static char *get_file_info(const char *, const char *);
  * is responsible for free'ing returned memory.
  */
 char *
-mime_type(const char *file_name) {
+mime_type(const char *file_name)
+{
     char *content_type = NULL;  /* mime content type */
     char *p;
-    static int loaded_defaults = 0;
 
 #ifdef MIMETYPEPROC
     char *mimetype;
@@ -55,9 +55,10 @@ mime_type(const char *file_name) {
 	struct node *np;		/* Content scan node pointer */
 	FILE *fp;			/* File pointer for mhn.defaults */
 
+        static bool loaded_defaults;
 	if (! loaded_defaults &&
 			(fp = fopen(p = etcpath("mhn.defaults"), "r"))) {
-	    loaded_defaults = 1;
+	    loaded_defaults = true;
 	    readconfig(NULL, fp, p, 0);
 	    fclose(fp);
 	}
@@ -80,16 +81,17 @@ mime_type(const char *file_name) {
 
 	if (content_type == NULL) {
 	    FILE *fp;
-	    int binary = 0, c;
+            int c;
 
 	    if (!(fp = fopen(file_name, "r"))) {
 		inform("unable to access file \"%s\"", file_name);
 		return NULL;
 	    }
 
+	    bool binary = false;
 	    while ((c = getc(fp)) != EOF) {
 		if (! isascii(c)  ||  c == 0) {
-		    binary = 1;
+		    binary = true;
 		    break;
 		}
 	    }
@@ -148,7 +150,7 @@ get_file_info(const char *proc, const char *file_name)
     if (!ok)
         return NULL;
 
-    /* s#^.*:[ \t]*##. */
+    /* s#^[^:]*:[ \t]*##. */
     info = buf;
     if ((needle = strchr(info, ':'))) {
         info = needle + 1;