Makefile.am: Add test/inc/test-eom-align to XFAIL_TESTS.

[nmh] / sbr / mime_type.c

diff --git a/sbr/mime_type.c b/sbr/mime_type.c
index b235bc7cf16f960bbd0b9741f5ca163e4d5bf27c..f1b96fe591c001ca6ac3885a11701ea4dec3c03a 100644 (file)
--- a/sbr/mime_type.c
+++ b/sbr/mime_type.c
@@ -1,5 +1,4 @@
-/*
- * mime_type.c -- routine to determine the MIME Content-Type of a file
+/* mime_type.c -- routine to determine the MIME Content-Type of a file
  *
  * This code is Copyright (c) 2014, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -9,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/tws.h>
+#include "mime_type.h"
 
 #ifdef MIMETYPEPROC
 static char *get_file_info(const char *, const char *);
@@ -69,7 +69,7 @@ mime_type(const char *file_name) {
        if ((p = strrchr(file_name, '.')) != NULL) {
            for (np = m_defs; np; np = np->n_next) {
                if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 &&
-                   strcasecmp(p, np->n_field ? np->n_field : "") == 0) {
+                   strcasecmp(p, FENDNULL(np->n_field)) == 0) {
                    content_type = strdup(np->n_name + 14);
                    break;
                }
@@ -132,7 +132,7 @@ get_file_info(const char *proc, const char *file_name) {
         FILE *fp;
 
         if ((fp = popen(cmd, "r")) != NULL) {
-            char buf[BUFSIZ >= 2048  ?  BUFSIZ  : 2048];
+            char buf[max(BUFSIZ, 2048)];
 
             buf[0] = '\0';
             if (fgets(buf, sizeof buf, fp)) {