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

[nmh] / test / mhfixmsg / test-mhfixmsg

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index 2194c7a2144db0f5db00af9aea3877e40025f7eb..8d7a3a857c7c081c689ca8fde16a6d7f649b7c79 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -17,8 +17,7 @@ fi
 setup_test
 
 #### Make sure that html-to-text conversion is what we expect.
 setup_test
 
 #### Make sure that html-to-text conversion is what we expect.

-require_locale en_US.utf-8 en_US.utf8
-LC_ALL=en_US.UTF-8; export LC_ALL
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8

 
 expected="$MH_TEST_DIR/test-mhfixmsg$$.expected"
 expected_err="$MH_TEST_DIR/test-mhfixmsg$$.expected_err"
 
 expected="$MH_TEST_DIR/test-mhfixmsg$$.expected"
 expected_err="$MH_TEST_DIR/test-mhfixmsg$$.expected_err"


@@ -46,10 +45,11 @@ fi
 
 
 # check -help
 
 
 # check -help

+start_test "-help"

 cat >"$expected" <<EOF
 Usage: mhfixmsg [+folder] [msgs] [switches]
   switches are:
 cat >"$expected" <<EOF
 Usage: mhfixmsg [+folder] [msgs] [switches]
   switches are:

-  -decodetext 8bit|7bit
+  -decodetext 8bit|7bit|binary

   -nodecodetext
   -decodetypes
   -[no]crlflinebreaks
   -nodecodetext
   -decodetypes
   -[no]crlflinebreaks


@@ -69,11 +69,13 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
   -help
 EOF
 
   -help
 EOF
 

-run_prog mhfixmsg -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog mhfixmsg -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 
 # check -version
 check "$expected" "$actual"
 
 
 # check -version

+start_test "-version"

 case `mhfixmsg -version` in
   mhfixmsg\ --*) ;;
   *) printf '%s: mhfixmsg -version generated unexpected output\n' "$0" >&2
 case `mhfixmsg -version` in
   mhfixmsg\ --*) ;;
   *) printf '%s: mhfixmsg -version generated unexpected output\n' "$0" >&2


@@ -83,12 +85,14 @@ esac
 
 # check that non-MIME messages aren't modified
 # check -outfile
 
 # check that non-MIME messages aren't modified
 # check -outfile

+start_test "that non-MIME messages aren't modified, and -outfile"

 run_test 'mhfixmsg first -outfile '"$actual" ''
 check "`mhpath first`" "$actual" 'keep first'
 
 
 # check that non-MIME messages with no bodies aren't modified
 # check -outfile
 run_test 'mhfixmsg first -outfile '"$actual" ''
 check "`mhpath first`" "$actual" 'keep first'
 
 
 # check that non-MIME messages with no bodies aren't modified
 # check -outfile

+start_test "that non-MIME messages with no bodies aren't modified, and -outfile"

 cat >`mhpath new` <<EOF
 From: Test <test@example.com>
 To: Some User <user@example.com>
 cat >`mhpath new` <<EOF
 From: Test <test@example.com>
 To: Some User <user@example.com>


@@ -102,6 +106,7 @@ check "`mhpath last`" "$actual"
 
 
 # check -nofixcte
 
 
 # check -nofixcte

+start_test "-nofixcte"

 cat >"$MH_TEST_DIR"/Mail/inbox/11 <<EOF
 From: Anon
 To: Mailinglist
 cat >"$MH_TEST_DIR"/Mail/inbox/11 <<EOF
 From: Anon
 To: Mailinglist


@@ -138,6 +143,7 @@ check "$MH_TEST_DIR"/Mail/inbox/11 "$MH_TEST_DIR"/Mail/inbox/12 'keep first'
 
 # check -fixcte (enabled by default):  fixup of erroneous C-T-E in multipart
 # check -verbose
 
 # check -fixcte (enabled by default):  fixup of erroneous C-T-E in multipart
 # check -verbose

+start_test "-fixcte (enabled by default):  fixup of erroneous C-T-E in multipart, and -verbose"

 cat >"$expected" <<EOF
 From: Anon
 To: Mailinglist
 cat >"$expected" <<EOF
 From: Anon
 To: Mailinglist


@@ -174,6 +180,7 @@ check "$expected" "$actual" 'keep first'
 
 
 # check with no options:  checks backup
 
 
 # check with no options:  checks backup

+start_test "with no options:  checks backup"

 cp "$MH_TEST_DIR"/Mail/inbox/11 "$MH_TEST_DIR"/Mail/inbox/11.original
 folder last >/dev/null
 run_test 'mhfixmsg' ''
 cp "$MH_TEST_DIR"/Mail/inbox/11 "$MH_TEST_DIR"/Mail/inbox/11.original
 folder last >/dev/null
 run_test 'mhfixmsg' ''


@@ -183,6 +190,7 @@ check "$MH_TEST_DIR"/Mail/inbox/,11 "$MH_TEST_DIR"/Mail/inbox/11.original
 
 
 # check backup with -file
 
 
 # check backup with -file

+start_test "backup with -file"

 cp "$MH_TEST_DIR"/Mail/inbox/11 "$MH_TEST_DIR"/Mail/inbox/11.original
 folder last >/dev/null
 run_test 'mhfixmsg -file '"$MH_TEST_DIR"/Mail/inbox/11 ''
 cp "$MH_TEST_DIR"/Mail/inbox/11 "$MH_TEST_DIR"/Mail/inbox/11.original
 folder last >/dev/null
 run_test 'mhfixmsg -file '"$MH_TEST_DIR"/Mail/inbox/11 ''


@@ -192,7 +200,7 @@ check "$MH_TEST_DIR"/Mail/inbox/,11 "$MH_TEST_DIR"/Mail/inbox/11.original
 
 # check -reformat (enabled by default):  addition of text/plain part
 # to solitary text/html part
 
 # check -reformat (enabled by default):  addition of text/plain part
 # to solitary text/html part

-#
+start_test "-reformat (enabled by default):  addition of text/plain part"

 prepare_space >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com
 prepare_space >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com


@@ -203,13 +211,13 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart"
 
 ------=_nmh-multipart
 Content-Type: text/plain; charset="Windows-1252"
 
 ------=_nmh-multipart
 Content-Type: text/plain; charset="Windows-1252"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 Need to go! Need ... to ... go!
 
 ------=_nmh-multipart
 Content-Type: text/html; charset="Windows-1252"
 
 Need to go! Need ... to ... go!
 
 ------=_nmh-multipart
 Content-Type: text/html; charset="Windows-1252"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 <html>
 <head>
 
 <html>
 <head>


@@ -266,11 +274,12 @@ fi
 
 
 # check implicit -file with absolute pathname
 
 
 # check implicit -file with absolute pathname

+start_test "implicit -file with absolute pathname"

 run_test "mhfixmsg `mhpath last` -outfile /dev/null" ''
 
 
 # check handling of boundary string that appears in message body
 run_test "mhfixmsg `mhpath last` -outfile /dev/null" ''
 
 
 # check handling of boundary string that appears in message body

-#
+start_test "handling of boundary string that appears in message body"

 prepare_space >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com
 prepare_space >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com


@@ -281,7 +290,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart-3"
 
 ------=_nmh-multipart-3
 Content-Type: text/plain; charset="Windows-1252"
 
 ------=_nmh-multipart-3
 Content-Type: text/plain; charset="Windows-1252"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 ------=_nmh-multipart
 ------=_nmh-multipart-1
 
 ------=_nmh-multipart
 ------=_nmh-multipart-1


@@ -289,7 +298,7 @@ Content-Transfer-Encoding: 8bit
 
 ------=_nmh-multipart-3
 Content-Type: text/html; charset="Windows-1252"
 
 ------=_nmh-multipart-3
 Content-Type: text/html; charset="Windows-1252"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 <html>
 <head>
 
 <html>
 <head>


@@ -348,6 +357,7 @@ fi
 
 
 # check -nodecode
 
 
 # check -nodecode

+start_test "-nodecode"

 prepare_space >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com
 prepare_space >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com


@@ -358,7 +368,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart"
 
 ------=_nmh-multipart
 Content-Type: text/plain; charset="Windows-1252"
 
 ------=_nmh-multipart
 Content-Type: text/plain; charset="Windows-1252"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 Need to go! Need ... to ... go!
 
 
 Need to go! Need ... to ... go!
 


@@ -421,6 +431,7 @@ fi
 
 
 # check -decodetext (enabled by default)
 
 
 # check -decodetext (enabled by default)

+start_test "-decodetext (enabled by default)"

 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -431,7 +442,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"
 Content-Disposition: attachment; filename="test4.txt"
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"
 Content-Disposition: attachment; filename="test4.txt"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is a text/plain part.
 
 
 This is a text/plain part.
 


@@ -460,6 +471,7 @@ check "$expected" "$actual"
 
 
 # check -decodetext with more complicated content structure
 
 
 # check -decodetext with more complicated content structure

+start_test "-decodetext with more complicated content structure"

 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -487,7 +499,7 @@ This is additional content after the last subpart of the multipart.
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test2.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test2.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is the second text/plain part.
 
 
 This is the second text/plain part.
 


@@ -500,7 +512,7 @@ This is the third text/plain part.
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"
 Content-Disposition: attachment; filename="test4.txt"
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"
 Content-Disposition: attachment; filename="test4.txt"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is the fourth text/plain part.
 
 
 This is the fourth text/plain part.
 


@@ -561,21 +573,22 @@ run_prog mhfixmsg last -outfile "$actual"
 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

-# check attempted -decodetext of binary text
+# check attempted (default, 8 bit) -decodetext of binary text

 #### Generated the encoded text below with:
 #### Generated the encoded text below with:

-####   $ printf '\x0\xbd\xb2=\xbc\n' | base64
+####   $ printf '\275\262=\274\000\n' | base64
+start_test "attempted (default, 8 bit) -decodetext of binary text"

 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com

-Subject: mhfixmsg attempted binary decode test
+Subject: mhfixmsg binary decode test

 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="iso-8859-1"; name="nul+square.txt"
+Content-Type: text/plain; charset="UTF-8"; name="nul+square.txt"

 Content-Transfer-Encoding: base64
 
 Content-Transfer-Encoding: base64
 

-AL2yPbwK
+vbI9vAAK

 
 ------- =_aaaaaaaaaa0--
 EOF
 
 ------- =_aaaaaaaaaa0--
 EOF


@@ -586,9 +599,8 @@ check `mhpath last` "$expected" 'keep first'
 
 
 # check for successful decode of a different part with attempted -decodetext
 
 
 # check for successful decode of a different part with attempted -decodetext

-# of binary text
-#### Generated the encoded text below with:
-####   $ printf '\x0\xbd\xb2=\xbc\n' | base64
+# of binary (>998 characters) text
+start_test "for successful decode of a different part with attempted -decodetext"

 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -598,7 +610,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="iso-8859-1"
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="iso-8859-1"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is a text plain part
 
 
 This is a text plain part
 


@@ -672,32 +684,63 @@ ICA8L2JvZHk+PC9odG1sPg==
 EOF
 
 run_prog mhfixmsg -noreformat last
 EOF
 
 run_prog mhfixmsg -noreformat last

+check `mhpath last` "$expected" 'keep first'
+
+
+# check for successful decode of a different part with -decodetext of binary
+# (>998 characters) text
+start_test "for successful decode of a different part with -decodetext of binary"
+cat >$expected <<EOF
+To: recipient@example.com
+From: sender@example.com
+Subject: mhfixmsg successful decode of text/plain with failed binary decode
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-Transfer-Encoding: binary
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="iso-8859-1"
+Content-Transfer-Encoding: 7bit
+
+This is a text plain part
+
+------- =_aaaaaaaaaa0
+Content-Type: text/html; charset="ascii"
+Content-Transfer-Encoding: binary
+Content-Disposition: inline
+
+<html><head><title>long line</title></head><body>This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  This line is greater than 998 characters in length, so this part should not be decoded.  </body></html>
+
+------- =_aaaaaaaaaa0--
+EOF
+
+run_prog mhfixmsg -noreformat -decodetext binary last

 check `mhpath last` "$expected"
 
 
 check `mhpath last` "$expected"
 
 

-# check -decodetext of binary text
-printf "%s\x0d\xbd\xb2=\xbc%s" "To: recipient@example.com
+# check -decodetext of binary (containing ASCII NUL) text
+start_test "-decodetext of binary (containing ASCII NUL) text"
+printf "%s\275\262=\274\000%s" "To: recipient@example.com

 From: sender@example.com
 Subject: mhfixmsg binary decode test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
 From: sender@example.com
 Subject: mhfixmsg binary decode test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"

+Content-Transfer-Encoding: binary

 
 ------- =_aaaaaaaaaa0
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset=\"iso-8859-1\"; name=\"nul+square.txt\"
+Content-Type: text/plain; charset=\"UTF-8\"; name=\"nul+square.txt\"

 Content-Transfer-Encoding: binary
 
 " "
 
 ------- =_aaaaaaaaaa0--
 " >"$expected"
 Content-Transfer-Encoding: binary
 
 " "
 
 ------- =_aaaaaaaaaa0--
 " >"$expected"

-## output_content() in mhoutsbr.c can't handle binary content.
-## mhfixmsg last -decodetext binary -outfile "$actual"
-## check "$expected" "$actual"
-rm -f "$expected"
-rmm last
+mhfixmsg last -decodetext binary -outfile "$actual"
+check "$expected" "$actual"

 
 
 # check that -reformat succeeds when decode of binary text fails
 
 
 # check that -reformat succeeds when decode of binary text fails

+start_test "that -reformat succeeds when decode of binary text fails"

 prepare_space >"$expected" <<'EOF'
 MIME-Version: 1.0
 Date: Thu, 11 Apr 2013 02:47:08 -0700
 prepare_space >"$expected" <<'EOF'
 MIME-Version: 1.0
 Date: Thu, 11 Apr 2013 02:47:08 -0700


@@ -708,7 +751,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart"
 
 ------=_nmh-multipart
 Content-Type: text/plain; charset="ISO-8859-1"
 
 ------=_nmh-multipart
 Content-Type: text/plain; charset="ISO-8859-1"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 Mile                                     $0.00
 Time                                    $78.71
 
 Mile                                     $0.00
 Time                                    $78.71


@@ -772,12 +815,14 @@ fi
 # check -textcharset
 # Also checks preservation of attributes after one (charset) that is
 # modified.
 # check -textcharset
 # Also checks preservation of attributes after one (charset) that is
 # modified.

+start_test "-textcharset"

 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 Subject: mhfixmsg textcharset test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 Subject: mhfixmsg textcharset test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"

+Content-Transfer-Encoding: 8bit

 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="utf-8"; name="square.txt"
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="utf-8"; name="square.txt"


@@ -790,7 +835,7 @@ Content-Transfer-Encoding: 8bit
 EOF
 
 #### Generated the encoded text below with:
 EOF
 
 #### Generated the encoded text below with:

-####   $ printf '\xbd\xb2=\xbc\n' | base64
+####   $ printf '\275\262=\274\n' | base64

 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -818,6 +863,7 @@ fi
 
 
 # check -nofixboundary
 
 
 # check -nofixboundary

+start_test "-nofixboundary"

 cat >"$expected" <<EOF
 EOF
 
 cat >"$expected" <<EOF
 EOF
 


@@ -844,10 +890,11 @@ EOF
 cp -p `mhpath last` `mhpath new`
 
 run_test 'mhfixmsg last -nofixboundary' ''
 cp -p `mhpath last` `mhpath new`
 
 run_test 'mhfixmsg last -nofixboundary' ''

-check "$MH_TEST_DIR"/Mail/inbox/17 "$MH_TEST_DIR"/Mail/inbox/18 'keep first'
+check "$MH_TEST_DIR"/Mail/inbox/18 "$MH_TEST_DIR"/Mail/inbox/19 'keep first'

 
 
 # check that message is not output when fed through stdin
 
 
 # check that message is not output when fed through stdin

+start_test "that message is not output when fed through stdin"

 run_prog mhfixmsg -file - -verbose <`mhpath last` >"$actual" 2>"$actual.err"
 check "$expected" "$actual"
 if grep "mhfixmsg: $MH_TEST_DIR/Mail/.*, fix multipart boundary" \
 run_prog mhfixmsg -file - -verbose <`mhpath last` >"$actual" 2>"$actual.err"
 check "$expected" "$actual"
 if grep "mhfixmsg: $MH_TEST_DIR/Mail/.*, fix multipart boundary" \


@@ -862,6 +909,7 @@ fi
 # check fixup of erroneous boundary in multipart (-fixboundary,
 # enabled by default)
 # check -verbose
 # check fixup of erroneous boundary in multipart (-fixboundary,
 # enabled by default)
 # check -verbose

+start_test "fixup of erroneous boundary in multipart (-fixboundary, enabled by default)"

 cat >"$expected" <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;
 cat >"$expected" <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;


@@ -883,11 +931,12 @@ The boundaries of this part don't match the header boundary.
 EOF
 
 run_test 'mhfixmsg last -outfile '"$actual"' -verbose' \
 EOF
 
 run_test 'mhfixmsg last -outfile '"$actual"' -verbose' \

-         "mhfixmsg: 17, fix multipart boundary"
+         "mhfixmsg: 18, fix multipart boundary"

 check "$expected" "$actual"
 
 
 # check that message is not modified when -fixboundary fails
 check "$expected" "$actual"
 
 
 # check that message is not modified when -fixboundary fails

+start_test "that message is not modified when -fixboundary fails"

 cat >`mhpath new` <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;
 cat >`mhpath new` <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;


@@ -916,6 +965,7 @@ check "$expected" "$actual"
 
 # check that text/plain part is not added to text/html in multipart/related
 # when it shouldn't be
 
 # check that text/plain part is not added to text/html in multipart/related
 # when it shouldn't be

+start_test "that text/plain part is not added to text/html in multipart/related when it shouldn't be"

 cat >`mhpath new` <<EOF
 MIME-Version: 1.0
 Date: Tue, 26 Feb 2013 18:07:20 -0600
 cat >`mhpath new` <<EOF
 MIME-Version: 1.0
 Date: Tue, 26 Feb 2013 18:07:20 -0600


@@ -958,6 +1008,7 @@ fi
 
 # check that text/plain part is added to text/html in multipart/related
 # when it should be
 
 # check that text/plain part is added to text/html in multipart/related
 # when it should be

+start_test "that text/plain part is added to text/html in multipart/related when it should be"

 cat >"$expected" <<EOF
 MIME-Version: 1.0
 Date: Tue, 26 Feb 2013 18:07:20 -0600
 cat >"$expected" <<EOF
 MIME-Version: 1.0
 Date: Tue, 26 Feb 2013 18:07:20 -0600


@@ -1019,6 +1070,7 @@ fi
 
 
 # check handling of rfc822 message type
 
 
 # check handling of rfc822 message type

+start_test "handling of rfc822 message type"

 cat >"$expected" <<EOF
 From: Test <test@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test <test@example.com>
 To: Some User <user@example.com>


@@ -1082,6 +1134,7 @@ check "$expected" "$actual"
 
 
 # check not stripping of CRs from ASCII text context (default)
 
 
 # check not stripping of CRs from ASCII text context (default)

+start_test "not stripping of CRs from ASCII text context (default)"

 cat >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com
 cat >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com


@@ -1109,6 +1162,7 @@ check "$expected" "$actual"
 
 
 # check stripping of CRs from ASCII text context
 
 
 # check stripping of CRs from ASCII text context

+start_test "stripping of CRs from ASCII text context"

 cat >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com
 cat >"$expected" <<EOF
 MIME-Version: 1.0
 From: sender@example.com


@@ -1136,6 +1190,7 @@ check "$expected" "$actual"
 
 
 # check -replacetextplain
 
 
 # check -replacetextplain

+start_test "-replacetextplain"

 prepare_space >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 prepare_space >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1145,13 +1200,12 @@ Content-Type: multipart/alternative; boundary="----=_Part_876302"
 
 ------=_Part_876302
 Content-Type: text/plain; charset="UTF-8"
 
 ------=_Part_876302
 Content-Type: text/plain; charset="UTF-8"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 Yes, the text/plain part really was empty.
 
 ------=_Part_876302
 Content-Type: text/html; charset="UTF-8"
 
 Yes, the text/plain part really was empty.
 
 ------=_Part_876302
 Content-Type: text/html; charset="UTF-8"

-Content-Transfer-Encoding: 8bit

 Content-Disposition: inline
 
 <html><head>
 Content-Disposition: inline
 
 <html><head>


@@ -1181,7 +1235,6 @@ Content-Disposition: inline
 
 ------=_Part_876302
 Content-Type: text/html; charset="UTF-8"
 
 ------=_Part_876302
 Content-Type: text/html; charset="UTF-8"

-Content-Transfer-Encoding: 8bit

 Content-Disposition: inline
 
 <html><head>
 Content-Disposition: inline
 
 <html><head>


@@ -1206,6 +1259,7 @@ fi
 
 
 # check -noreplacetextplain
 
 
 # check -noreplacetextplain

+start_test "-noreplacetextplain"

 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1222,7 +1276,6 @@ Content-Disposition: inline
 
 ------=_Part_876302
 Content-Type: text/html; charset="UTF-8"
 
 ------=_Part_876302
 Content-Type: text/html; charset="UTF-8"

-Content-Transfer-Encoding: 8bit

 Content-Disposition: inline
 
 <html><head>
 Content-Disposition: inline
 
 <html><head>


@@ -1241,6 +1294,7 @@ check "$expected" "$actual"
 
 
 # check removal of extraneous trailing semicolon from header parameter list
 
 
 # check removal of extraneous trailing semicolon from header parameter list

+start_test "removal of extraneous trailing semicolon from header parameter list"

 cat >"$expected" <<EOF
 To: recipient@example.com
 Subject: test
 cat >"$expected" <<EOF
 To: recipient@example.com
 Subject: test


@@ -1293,35 +1347,39 @@ check "$expected" "$actual"
 
 
 # check rmmproc
 
 
 # check rmmproc

+start_test "rmmproc"

 cat >"$MH_TEST_DIR/Mail/rmmproc" <<'EOF'
 mv "$1" "$1.backup"
 EOF
 chmod a+x "${MH_TEST_DIR}/Mail/rmmproc"
 echo "rmmproc: ${MH_TEST_DIR}/Mail/rmmproc" >>"$MH"
 cat >"$MH_TEST_DIR/Mail/rmmproc" <<'EOF'
 mv "$1" "$1.backup"
 EOF
 chmod a+x "${MH_TEST_DIR}/Mail/rmmproc"
 echo "rmmproc: ${MH_TEST_DIR}/Mail/rmmproc" >>"$MH"

-cp "${MH_TEST_DIR}/Mail/inbox/15" "${MH_TEST_DIR}/Mail/inbox/15.original"
+cp "${MH_TEST_DIR}/Mail/inbox/16" "${MH_TEST_DIR}/Mail/inbox/16.original"

 
 

-run_test 'mhfixmsg 15' ''
-check "${MH_TEST_DIR}/Mail/inbox/15.backup" \
-      "${MH_TEST_DIR}/Mail/inbox/15.original"
+run_test 'mhfixmsg 16' ''
+check "${MH_TEST_DIR}/Mail/inbox/16.backup" \
+      "${MH_TEST_DIR}/Mail/inbox/16.original"

 
 
 # check -normmproc
 
 
 # check -normmproc

-cp "${MH_TEST_DIR}/Mail/inbox/20" "${MH_TEST_DIR}/Mail/inbox/21"
+start_test "-normmproc"
+cp "${MH_TEST_DIR}/Mail/inbox/21" "${MH_TEST_DIR}/Mail/inbox/22"

 
 

-run_test 'mhfixmsg 20 -normmproc'
-check "${MH_TEST_DIR}/Mail/inbox/21" \
-      "${MH_TEST_DIR}/Mail/inbox/,20" 'keep first'
+run_test 'mhfixmsg 21 -normmproc'
+check "${MH_TEST_DIR}/Mail/inbox/22" \
+      "${MH_TEST_DIR}/Mail/inbox/,21" 'keep first'

 
 
 # check -rmmproc
 
 
 # check -rmmproc

+start_test "-rmmproc"

 run_test 'mhfixmsg 21 -rmmproc true'
 run_test 'mhfixmsg 21 -rmmproc true'

-if test -f '${MH_TEST_DIR}/Mail/inbox/21.backup'; then
+if test -f '${MH_TEST_DIR}/Mail/inbox/22.backup'; then

   echo check of mhfixmsg -rmmproc FAILED, should not have created backup file
   failed=`expr ${failed:-0} + 1`
 fi
 
 
 # check -fixtype
   echo check of mhfixmsg -rmmproc FAILED, should not have created backup file
   failed=`expr ${failed:-0} + 1`
 fi
 
 
 # check -fixtype

+start_test "-fixtype"

 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1357,6 +1415,7 @@ check "$expected" `mhpath last`
 
 
 # check default -decodetypes
 
 
 # check default -decodetypes

+start_test "default -decodetypes"

 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1368,14 +1427,14 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is the text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/html; charset="iso-8859-1"; name="test2.txt"
 Content-Disposition: attachment; filename="test2.txt"
 
 This is the text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/html; charset="iso-8859-1"; name="test2.txt"
 Content-Disposition: attachment; filename="test2.txt"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 <html>
 <head>
 
 <html>
 <head>


@@ -1417,6 +1476,7 @@ check "$expected" "$actual"
 
 
 # check -decodetypes text/plain
 
 
 # check -decodetypes text/plain

+start_test "-decodetypes text/plain"

 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1428,7 +1488,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is the text/plain part.
 
 
 This is the text/plain part.
 


@@ -1473,6 +1533,7 @@ check "$expected" "$actual"
 
 
 # check -decodetypes attachment/ics
 
 
 # check -decodetypes attachment/ics

+start_test "-decodetypes attachment/ics"

 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1484,14 +1545,14 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is the text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/ics; charset="iso-8859-1"; name="invite.ics"
 Content-Disposition: attachment; filename="invite.ics"
 
 This is the text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/ics; charset="iso-8859-1"; name="invite.ics"
 Content-Disposition: attachment; filename="invite.ics"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 BEGIN:VCALENDAR\r
 VERSION:2.0\r
 
 BEGIN:VCALENDAR\r
 VERSION:2.0\r


@@ -1540,6 +1601,7 @@ check "$expected" "$actual"
 
 
 # check -decodetypes attachment/ics and -nocrlflinebreaks
 
 
 # check -decodetypes attachment/ics and -nocrlflinebreaks

+start_test "-decodetypes attachment/ics and -nocrlflinebreaks"

 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >$expected <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -1551,14 +1613,14 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Disposition: attachment; filename="test1.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 This is the text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/ics; charset="iso-8859-1"; name="invite.ics"
 Content-Disposition: attachment; filename="invite.ics"
 
 This is the text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/ics; charset="iso-8859-1"; name="invite.ics"
 Content-Disposition: attachment; filename="invite.ics"

-Content-Transfer-Encoding: 8bit
+Content-Transfer-Encoding: 7bit

 
 BEGIN:VCALENDAR
 VERSION:2.0
 
 BEGIN:VCALENDAR
 VERSION:2.0


@@ -1608,10 +1670,11 @@ check "$expected" "$actual"
 
 # check that input is passed through to output when there's a parse error
 # (the charset string is missing its closing quote) with -outfile
 
 # check that input is passed through to output when there's a parse error
 # (the charset string is missing its closing quote) with -outfile

+start_test "that input is passed through to output when there's a parse error"

 cat >"$expected.err" <<EOF
 cat >"$expected.err" <<EOF

-mhfixmsg: invalid quoted-string in message 30's Content-Type: field
+mhfixmsg: invalid quoted-string in message 31's Content-Type: field

           (parameter charset)
           (parameter charset)

-mhfixmsg: unable to parse message 30
+mhfixmsg: unable to parse message 31

 EOF
 
 cat >`mhpath new` <<EOF
 EOF
 
 cat >`mhpath new` <<EOF


@@ -1643,6 +1706,7 @@ check "$expected.err" "$actual.err"
 # (the charset string is missing its closing quote) with -outfile, and
 # input from stdin.  Don't check err output, because it contains the name
 # of a tmp file.  It's similar to that of the previous check.
 # (the charset string is missing its closing quote) with -outfile, and
 # input from stdin.  Don't check err output, because it contains the name
 # of a tmp file.  It's similar to that of the previous check.

+start_test "that input is passed through to output when there's a parse error"

 set +e
 run_prog mhfixmsg -file - -outfile - <`mhpath last` >"$actual" 2>/dev/null
 set -e
 set +e
 run_prog mhfixmsg -file - -outfile - <`mhpath last` >"$actual" 2>/dev/null
 set -e


@@ -1650,6 +1714,60 @@ set -e
 check `mhpath last` "$actual"
 
 
 check `mhpath last` "$actual"
 
 

+start_test "fix RFC 2047 encoded header parameters"
+#### Also, add C-T-E:8bit to the message headers.
+cat >"$expected" <<EOF
+To: recipient@example.com
+From: sender@example.com
+Date: Wed, 28 Sep 2016 11:24:28 -0400
+Subject: invalid header parameter encoding
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary=001a114dd3e8fe9c56053d92f414
+Content-Transfer-Encoding: 8bit
+
+--001a114dd3e8fe9c56053d92f414
+Content-Type: text/plain; charset=UTF-8
+
+This is a test.
+
+--001a114dd3e8fe9c56053d92f414
+Content-Type: text/plain; charset="UTF-8"; name*=UTF-8''test%C3%B8.txt
+Content-Disposition: attachment; filename*=UTF-8''test%C3%B8.txt
+Content-Transfer-Encoding: 8bit
+
+This is the first text/plain part, in a subpart.  The file name
+is testø.txt.
+
+--001a114dd3e8fe9c56053d92f414--
+EOF
+
+cat >`mhpath new` <<EOF
+To: recipient@example.com
+From: sender@example.com
+Date: Wed, 28 Sep 2016 11:24:28 -0400
+Subject: invalid header parameter encoding
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary=001a114dd3e8fe9c56053d92f414
+
+--001a114dd3e8fe9c56053d92f414
+Content-Type: text/plain; charset=UTF-8
+
+This is a test.
+
+--001a114dd3e8fe9c56053d92f414
+Content-Type: text/plain; charset=UTF-8; name="=?UTF-8?B?dGVzdMO4LnR4dA==?="
+Content-Disposition: attachment; filename="=?UTF-8?B?dGVzdMO4LnR4dA==?="
+Content-Transfer-Encoding: 8bit
+
+This is the first text/plain part, in a subpart.  The file name
+is testø.txt.
+
+--001a114dd3e8fe9c56053d92f414--
+EOF
+run_prog mhfixmsg -file - -outfile - <`mhpath last` >"$actual" 2>/dev/null
+check "$expected" "$actual"
+
+

 # make sure there are no tmp files left over
 find "$MH_TEST_DIR/Mail" \( -name 'mhfix*' -o -name ',mhfix*' \) -print \
   >"$actual"
 # make sure there are no tmp files left over
 find "$MH_TEST_DIR/Mail" \( -name 'mhfix*' -o -name ',mhfix*' \) -print \
   >"$actual"


@@ -1658,5 +1776,5 @@ EOF
 
 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 

-
+finish_test

 exit $failed
 exit $failed