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 bd63446aa14a13583f121379c45311a084237fdc..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"
@@ -697,6 +696,7 @@ 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"
  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"
  
  ------- =_aaaaaaaaaa0
  Content-Type: text/plain; charset="iso-8859-1"
@@ -725,6 +725,7 @@ From: sender@example.com
  Subject: mhfixmsg binary decode test
  MIME-Version: 1.0
  Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
  Subject: mhfixmsg binary decode test
  MIME-Version: 1.0
  Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
+Content-Transfer-Encoding: binary
  
  ------- =_aaaaaaaaaa0
  Content-Type: text/plain; charset=\"UTF-8\"; name=\"nul+square.txt\"
  
  ------- =_aaaaaaaaaa0
  Content-Type: text/plain; charset=\"UTF-8\"; name=\"nul+square.txt\"
@@ -821,6 +822,7 @@ From: sender@example.com
  Subject: mhfixmsg textcharset test
  MIME-Version: 1.0
  Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
  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"
@@ -1204,7 +1206,6 @@ Yes, the text/plain part really was empty.
  
  ------=_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>
@@ -1234,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>
@@ -1276,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>
@@ -1716,6 +1715,7 @@ check `mhpath last` "$actual"
  
  
  start_test "fix RFC 2047 encoded header parameters"
  
  
  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
  cat >"$expected" <<EOF
  To: recipient@example.com
  From: sender@example.com
@@ -1723,6 +1723,7 @@ Date: Wed, 28 Sep 2016 11:24:28 -0400
  Subject: invalid header parameter encoding
  MIME-Version: 1.0
  Content-Type: multipart/mixed; boundary=001a114dd3e8fe9c56053d92f414
  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
  
  --001a114dd3e8fe9c56053d92f414
  Content-Type: text/plain; charset=UTF-8