Switch over get_ctinfo() to determine the filename based on the filename if

[nmh] / test / mhbuild / test-ext-params

diff --git a/test/mhbuild/test-ext-params b/test/mhbuild/test-ext-params
index 5e4a681b37aa8fb70761c8941d5b0ed21f93be27..96cad2e93435006a5b70dd05520da36258c032e3 100755 (executable)
--- a/test/mhbuild/test-ext-params
+++ b/test/mhbuild/test-ext-params
@@ -101,17 +101,58 @@ EOF
 check "$draft" "$expected"
 
 #
-# Try out both!
+# Try out attach with a filename with 8-bit characters
 #
 
+cp "${srcdir}/test/mhbuild/tiny.jpg" "$MH_TEST_DIR/tïny.jpg"
+
 cat > "$draft" <<EOF
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox
+Attach: $MH_TEST_DIR/tïny.jpg
 ------
 This is a test message
-#image/jpeg {attachment; filename="This is an ëxample of a rather long filename that is longer than would fit on a normal line.jpg"} \
-${srcdir}/test/mhbuild/tiny.jpg
+EOF
+
+run_prog mhbuild "$draft"
+
+cat > "$expected" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+
+This is a test message
+
+------- =_aaaaaaaaaa0
+Content-Type: image/jpeg; name*=UTF-8''t%C3%AFny.jpg
+Content-Description: =?UTF-8?B?dMOvbnkuanBn?=
+Content-Disposition: attachment; filename*=UTF-8''t%C3%AFny.jpg
+Content-Transfer-Encoding: base64
+
+/9g=
+
+------- =_aaaaaaaaaa0--
+EOF
+
+check "$draft" "$expected"
+
+#
+# Alternate version; specify a disposion, but not an explicit filename
+#
+
+cat > "$draft" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+------
+This is a test message
+#image/jpeg {attachment} $MH_TEST_DIR/tïny.jpg
 EOF
 
 run_prog mhbuild "$draft"
@@ -130,10 +171,7 @@ This is a test message
 
 ------- =_aaaaaaaaaa0
 Content-Type: image/jpeg
-Content-Disposition: attachment;
-       filename*0*=UTF-8''This%20is%20an%20%C3%ABxample%20of%20a%20rather;
-       filename*1=" long filename that is longer than would fit on a norma";
-       filename*2="l line.jpg"
+Content-Disposition: attachment; filename*=UTF-8''t%C3%AFny.jpg
 Content-Transfer-Encoding: base64
 
 /9g=