Replaced us-ascii with iso-8859-1 in examples, just because.

diff --git a/test/mhlist/test-mhlist b/test/mhlist/test-mhlist
index f61a136..91748b1 100755 (executable)
--- a/test/mhlist/test-mhlist
+++ b/test/mhlist/test-mhlist
@@ -86,15 +86,15 @@ Content-Type: multipart/related;
     boundary="subpart__1.1"
 
 --subpart__1.1
     boundary="subpart__1.1"
 
 --subpart__1.1

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test1"
 
 Content-Disposition: attachment; filename="test1"
 

-This is the first text/plain part.
+This is the first text/plain part, in a subpart.

 
 --subpart__1.1--
 
 ------- =_aaaaaaaaaa0
 
 --subpart__1.1--
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test2"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename="test2"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Transfer-Encoding: quoted-printable

@@ -102,13 +102,13 @@ Content-Transfer-Encoding: quoted-printable
 This is the second text/plain part.
 
 ------- =_aaaaaaaaaa0
 This is the second text/plain part.
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test3"
 
 This is the third text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Disposition: attachment; filename="test3"
 
 This is the third text/plain part.
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test4"
 Content-Transfer-Encoding: base64
 
 Content-Disposition: attachment; filename="test4"
 Content-Transfer-Encoding: base64
 

@@ -119,57 +119,57 @@ EOF
 
 # check -part
 run_test 'mhlist last -part 3 -noheader' \
 
 # check -part
 run_test 'mhlist last -part 3 -noheader' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
+'  11       multipart/mixed            922
+     1     multipart/related          180

      3     text/plain                  35'
 
 # check -part of a subpart
 run_test 'mhlist last -part 1.1 -noheader' \
      3     text/plain                  35'
 
 # check -part of a subpart
 run_test 'mhlist last -part 1.1 -noheader' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
-     1.1   text/plain                  35'
+'  11       multipart/mixed            922
+     1     multipart/related          180
+     1.1   text/plain                  49'

 
 # check -type
 run_test 'mhlist last -type text/plain -noheader' \
 
 # check -type
 run_test 'mhlist last -type text/plain -noheader' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
-     1.1   text/plain                  35
+'  11       multipart/mixed            922
+     1     multipart/related          180
+     1.1   text/plain                  49

      2     text/plain                  36
      3     text/plain                  35
      4     text/plain                  36'
 
 # check -norealsize
 run_test 'mhlist last -part 4 -noheader -norealsize' \
      2     text/plain                  36
      3     text/plain                  35
      4     text/plain                  36'
 
 # check -norealsize
 run_test 'mhlist last -part 4 -noheader -norealsize' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
+'  11       multipart/mixed            922
+     1     multipart/related          180

      4     text/plain                  49'
 
 # check -realsize, the default
 run_test 'mhlist last -part 4 -noheader -norealsize -realsize' \
      4     text/plain                  49'
 
 # check -realsize, the default
 run_test 'mhlist last -part 4 -noheader -norealsize -realsize' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
+'  11       multipart/mixed            922
+     1     multipart/related          180

      4     text/plain                  36'
 
 # check -check
 run_test 'mhlist last -part 2 -noheader -check' \
      4     text/plain                  36'
 
 # check -check
 run_test 'mhlist last -part 2 -noheader -check' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
+'  11       multipart/mixed            922
+     1     multipart/related          180

      2     text/plain                  36'
 
 # check -check with bad MD5 checksum
 sed 's/\(Content-MD5: \)kq+Hnc/\1BADBAD/' $msgfile > $MH_TEST_DIR/$$.tmp
 mv -f $MH_TEST_DIR/$$.tmp $msgfile
 run_test 'mhlist last -part 2 -noheader -check' \
      2     text/plain                  36'
 
 # check -check with bad MD5 checksum
 sed 's/\(Content-MD5: \)kq+Hnc/\1BADBAD/' $msgfile > $MH_TEST_DIR/$$.tmp
 mv -f $MH_TEST_DIR/$$.tmp $msgfile
 run_test 'mhlist last -part 2 -noheader -check' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
+'  11       multipart/mixed            922
+     1     multipart/related          180

      2     text/plain                  36
 mhlist: content integrity suspect (digest mismatch) -- continuing
         (content text/plain in message 11, part 2)'
 
 # check -nocheck, the default
 run_test 'mhlist last -part 2 -noheader -check -nocheck' \
      2     text/plain                  36
 mhlist: content integrity suspect (digest mismatch) -- continuing
         (content text/plain in message 11, part 2)'
 
 # check -nocheck, the default
 run_test 'mhlist last -part 2 -noheader -check -nocheck' \

-'  11       multipart/mixed            900
-     1     multipart/related          164
+'  11       multipart/mixed            922
+     1     multipart/related          180

      2     text/plain                  36'
 
 exit $failed
      2     text/plain                  36'
 
 exit $failed

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
index 52b92f7..2077c83 100755 (executable)
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -80,7 +80,7 @@ Content-Type: multipart/related;
     boundary="subpart__1.1"
 
 --subpart__1.1
     boundary="subpart__1.1"
 
 --subpart__1.1

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test1.txt"
 
 This is the first text/plain part, in a subpart.
 Content-Disposition: attachment; filename="test1.txt"
 
 This is the first text/plain part, in a subpart.

@@ -88,7 +88,7 @@ This is the first text/plain part, in a subpart.
 --subpart__1.1--
 
 ------- =_aaaaaaaaaa0
 --subpart__1.1--
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test2.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename="test2.txt"
 Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
 Content-Transfer-Encoding: quoted-printable

@@ -96,13 +96,13 @@ Content-Transfer-Encoding: quoted-printable
 This is the second text/plain part.
 
 ------- =_aaaaaaaaaa0
 This is the second text/plain part.
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 Content-Disposition: attachment; filename="test3.txt"
 
 This is the third text/plain part.
 
 ------- =_aaaaaaaaaa0
 Content-Disposition: attachment; filename="test3.txt"
 
 This is the third text/plain part.
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="us-ascii"; name="test4.txt"
+Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"

 Content-Disposition: attachment; filename="test4.txt"
 Content-Transfer-Encoding: base64
 
 Content-Disposition: attachment; filename="test4.txt"
 Content-Transfer-Encoding: base64
 

@@ -200,7 +200,7 @@ Subject: mhlist test
 MIME-Version: 1.0
 Content-Type: message/partial; id="test-mhstore message/partial test"; number=1
 
 MIME-Version: 1.0
 Content-Type: message/partial; id="test-mhstore message/partial test"; number=1
 

-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; charset="iso-8859-1"

 
 This is part one of three.
 EOF
 
 This is part one of three.
 EOF