From: David Levine <levinedl@acm.org>
Date: Sun, 22 Dec 2013 23:38:59 +0000 (-0600)
Subject: In test-mhmail, insert semicolon in output of "file --mime" if needed.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/2066fc1f0d6f122ddec169390f8b4b3d78980079?ds=sidebyside;hp=ad47ad24fe6707b96237b09e43dfbb4c3e2a2a82

In test-mhmail, insert semicolon in output of "file --mime" if needed.
---

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index c773c041..df921b6d 100755
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -21,10 +21,12 @@ content_type_string() {
     echo "text/plain; name=\"`basename $1`\"; charset=\"us-ascii\""
   else
     # 1) Excise leading filename followed by : and any whitespace.
-    # 2) Wrap charset value in double quotes.  Assume that it isn't already.
+    # 2) Insert semicolon if there isn't one before the first space.
+    #    OpenBSD file --mime spits out things like "text/plain charset=...".
+    # 3) Wrap charset value in double quotes.  Assume that it isn't already.
     printf "%s %s%s" \
-      `$MIMETYPEPROC $1 | sed -e 's/.*: *//' -e 's/\(charset=\)\(.*\)/\1"\2"/'`\
-      "; name=\"`basename $1`\""
+      `$MIMETYPEPROC $1 | sed -e 's/.*: *//' -e 's/\([^;]\) /\1; /' \
+         -e 's/\(charset=\)\(.*\)/\1"\2"/'` "; name=\"`basename $1`\""
   fi
 }