Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / m4 / mimetype.m4

diff --git a/m4/mimetype.m4 b/m4/mimetype.m4
index b97c49d463c702becf94cb08ff6674ffb82aa499..c9bb325c3285664b0efe1e7cf26f7f927dce667c 100644 (file)
--- a/m4/mimetype.m4
+++ b/m4/mimetype.m4
@@ -11,7 +11,10 @@ AC_DEFUN([NMH_MIMETYPEPROC],
 [AC_CACHE_CHECK([for a program to provide a MIME type string],
                [nmh_cv_mimetype_proc],
   [nmh_cv_mimetype_proc=
-   for mprog in 'file --brief --mime-type' 'file --mime-type'
+   for mprog in 'file --brief --dereference --mime-type' \
+                'file --dereference --mime-type' \
+                'file --brief --mime-type' \
+                'file --mime-type'
    do
      AS_IF([$mprog "${srcdir}/configure" > /dev/null 2>&1],
           [nmh_cv_mimetype_proc="$mprog"; break])
@@ -19,18 +22,24 @@ AC_DEFUN([NMH_MIMETYPEPROC],
 AS_IF([test X"$nmh_cv_mimetype_proc" != X],
       [mimetype_proc="\"${nmh_cv_mimetype_proc}\""
        AC_DEFINE_UNQUOTED([MIMETYPEPROC], [$mimetype_proc],
-                 [Program, with arguments, to provides MIME type.])])])
+                 [Program, with arguments, to provide MIME type.])])])
 
+dnl The OpenBSD 5.4 file (4.24) reports --mime-encoding of text
+dnl files as "binary".  Detect that by only accepting "us-ascii".
 AC_DEFUN([NMH_MIMEENCODINGPROC],
 [AC_CACHE_CHECK([for a program to provide a MIME encoding string],
                [nmh_cv_mimeencoding_proc],
   [nmh_cv_mimeencoding_proc=
-   for mprog in 'file --brief --mime-encoding' 'file --mime-encoding'
+   for mprog in 'file --brief --dereference --mime-encoding' \
+                'file --dereference --mime-encoding' \
+                'file --brief --mime-encoding' \
+                'file --mime-encoding'
    do
-     AS_IF([$mprog "${srcdir}/configure" > /dev/null 2>&1],
-          [nmh_cv_mimeencoding_proc="$mprog"; break])
+     AS_IF([$mprog "${srcdir}/DATE" > /dev/null 2>&1],
+               AS_CASE([`$mprog "${srcdir}/DATE"`],
+                       [us-ascii],[nmh_cv_mimeencoding_proc="$mprog"; break]))
    done])
 AS_IF([test X"$nmh_cv_mimeencoding_proc" != X],
       [mimeencoding_proc="\"${nmh_cv_mimeencoding_proc}\""
        AC_DEFINE_UNQUOTED([MIMEENCODINGPROC], [$mimeencoding_proc],
-                 [Program, with arguments, to provides MIME encoding.])])])
+                 [Program, with arguments, to provide MIME encoding.])])])