From: Ralph Corderoy Date: Sun, 24 Sep 2017 13:10:18 +0000 (+0100) Subject: inc/test-eom-align: Fix MMDF-mbox `B' size calculation. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ca2f8cc7e93a21f9f04e0d976ca97feac4802e91 inc/test-eom-align: Fix MMDF-mbox `B' size calculation. Also, have the email body end in what appears to be the MMDF magic string for the first few bytes; otherwise, the test mbox is just a boring single email compared to the `A', From_, version. Fixes 8699f1cc. --- diff --git a/test/inc/test-eom-align b/test/inc/test-eom-align index d4febfce..22c8212c 100755 --- a/test/inc/test-eom-align +++ b/test/inc/test-eom-align @@ -110,15 +110,17 @@ makembox_B () { } # makemmdf_B mmdfboxname sz +# The mbox file will be sz bytes and contain a single email, topped and +# tailed with MMDF's magic strings. The end of the email's body looks +# the same as the magic string for three bytes. makemmdf_B () { MBOX="$1" SZ=$2 - arith_eval $SZ - $HDRSZ - $MMDFDELIMLINESZ - 1; WANTSZ=$arith_val + arith_eval $SZ - $MMDFDELIMLINESZ - $HDRSZ - 1 - 4 - $MMDFDELIMLINESZ; WANTSZ=$arith_val dd if="$FILLER" of="$MBOX.body" bs="$WANTSZ" count=1 2>/dev/null echo >> "$MBOX.body" - #### The final $MMDF_DELIM allows $MBOX to exactly match a file - #### created by packf. + printf '\1\1\1\n' >>"$MBOX.body" (eval "$MMDF_DELIM"; cat "$HDR" "$MBOX.body"; eval "$MMDF_DELIM") > "$MBOX" }