Replace some strdup() with mh_xstrdup().

[nmh] / test / mhbuild / test-attach

diff --git a/test/mhbuild/test-attach b/test/mhbuild/test-attach
index 12d3da39a3adeab8cc508d0d72a8be6ae9c5fe94..c97ec3941f8d82f9b6d41a5e061344fc60df95c8 100755 (executable)
--- a/test/mhbuild/test-attach
+++ b/test/mhbuild/test-attach
@@ -1,7 +1,7 @@
 #!/bin/sh
 ######################################################
 #
 #!/bin/sh
 ######################################################
 #

-# Test the use of the Attach: header
+# Test the use of the Nmh-Attach: header

 #
 ######################################################
 
 #
 ######################################################
 


@@ -14,9 +14,10 @@ fi
 
 setup_test
 
 
 setup_test
 

-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

 
 draft="$MH_TEST_DIR/$$.draft"
 
 draft="$MH_TEST_DIR/$$.draft"

+backup="${MH_TEST_DIR}/`mhparam sbackup`$$.draft.orig"

 expected="$MH_TEST_DIR/$$.expected"
 
 #
 expected="$MH_TEST_DIR/$$.expected"
 
 #


@@ -27,7 +28,7 @@ cat > "$draft" <<EOF
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox

-Attach: ${srcdir}/test/mhbuild/tiny.jpg
+Nmh-Attach: ${srcdir}/test/mhbuild/tiny.jpg

 ------
 EOF
 
 ------
 EOF
 


@@ -57,7 +58,8 @@ cat > "$draft" <<EOF
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox

-Attach: ${srcdir}/test/mhbuild/tiny.jpg
+Nmh-Attach: ${srcdir}/test/mhbuild/tiny.jpg
+Nmh-Attach: ${srcdir}/test/mhbuild/nulls

 ------
 This is a test
 EOF
 ------
 This is a test
 EOF


@@ -84,6 +86,14 @@ Content-Transfer-Encoding: base64
 
 /9g=
 
 
 /9g=
 

+------- =_aaaaaaaaaa0
+Content-Type: application/octet-stream; name="nulls"
+Content-Description: nulls
+Content-Disposition: attachment; filename="nulls"
+Content-Transfer-Encoding: base64
+
+AAAAAAAAAAAAAAAAAAAA
+

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


@@ -97,7 +107,7 @@ cat > "$draft" <<EOF
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox
 To: Mr Test <mrtest@example.com>
 cc:
 Fcc: +outbox

-Attach:
+Nmh-Attach:

 ------
 This is a test of an empty attach header.
 EOF
 ------
 This is a test of an empty attach header.
 EOF


@@ -138,6 +148,36 @@ MIME-Version: 1.0
 Content-Type: text/plain
 EOF
 
 Content-Type: text/plain
 EOF
 

+#
+# Check an md5'd attachment
+#
+
+cat > "$draft" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+Subject: Test of digested part
+
+#text/plain; name="textplain" [ - ] ${srcdir}/test/mhbuild/textplain
+
+EOF
+
+mhbuild -check "$draft"
+
+cat > "$expected" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+Subject: Test of digested part
+MIME-Version: 1.0
+Content-Type: text/plain; name="textplain"; charset="us-ascii"
+Content-Description:  - 
+Content-MD5: x3hNJn10cGowZv+ILUkycw==
+Content-Transfer-Encoding: quoted-printable
+
+This is a text/plain part.
+EOF
+

 check "$draft" "$expected"
 
 #
 check "$draft" "$expected"
 
 #


@@ -202,7 +242,7 @@ check "$draft" "$expected"
 
 #
 # Two parts, one attachment; make sure mixing of multiparts at different
 
 #
 # Two parts, one attachment; make sure mixing of multiparts at different

-# levels works
+# levels works.  This also tests Attach: instead of Nmh-Attach:.

 #
 
 cat > "$draft" <<EOF
 #
 
 cat > "$draft" <<EOF


@@ -270,4 +310,99 @@ EOF
 
 check "$draft" "$expected"
 
 
 check "$draft" "$expected"
 

+#
+# One attachment, text/plain containing some binary characters,
+# include NUL bytes.
+#
+
+cat > "$draft" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+Subject: Testing some binary chars
+--------
+This is some tëxt.
+#text/plain; name="somebinary" [ - ] {attachment} ${srcdir}/test/mhbuild/somebinary
+EOF
+
+run_prog mhbuild "$draft"
+
+cat > "$expected" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+Subject: Testing some binary chars
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-Transfer-Encoding: 8bit
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+This is some tëxt.
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="somebinary"; charset="us-ascii"
+Content-Description:  - 
+Content-Disposition: attachment; filename="somebinary"
+Content-Transfer-Encoding: quoted-printable
+
+
+=46rom here on, this is only =
+
+a test, though it contains =13ome
+=00odd=00 bytes.
+
+------- =_aaaaaaaaaa0--
+EOF
+
+check "$draft" "$expected"
+
+# check that blank line is inserted between header and content
+
+cat > "$MH_TEST_DIR/Mail/oneline" <<EOF
+There needs to be a blank line before this content line.
+EOF
+
+cat > "$draft" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+Subject: test blank line between header and content
+--------
+#text/plain {inline} $MH_TEST_DIR/Mail/oneline
+#application/octet-stream {inline} $MH_TEST_DIR/Mail/oneline
+EOF
+
+run_prog mhbuild "$draft"
+
+cat > "$expected" <<EOF
+To: Mr Test <mrtest@example.com>
+cc:
+Fcc: +outbox
+Subject: test blank line between header and content
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+Content-Disposition: inline; filename="oneline"
+
+There needs to be a blank line before this content line.
+
+------- =_aaaaaaaaaa0
+Content-Type: application/octet-stream
+Content-Disposition: inline; filename="oneline"
+
+There needs to be a blank line before this content line.
+
+------- =_aaaaaaaaaa0--
+EOF
+
+check "$draft" "$expected"
+
+
+[ ${failed:=0} -eq 0 ]  &&  rm -f ${backup}
+

 exit ${failed:-0}
 exit ${failed:-0}