Added support for m_getfld() callers interleaving fseek() calls

[nmh] / test / bad-input / test-header

diff --git a/test/bad-input/test-header b/test/bad-input/test-header
index 71a63a9abbc4eda8f4d064d0f5fc3c2d7986c5ea..9f78b3764df020a39bffc9dd4d4519ff02e924ce 100755 (executable)
--- a/test/bad-input/test-header
+++ b/test/bad-input/test-header
@@ -6,29 +6,20 @@
 ######################################################
 
 if test -z "${MH_OBJ_DIR}"; then
-    srcdir=`dirname $0`/../..
-    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 
-# TODO: Move to a common file tests can source; need more framework...
-failed=0
-check() {
-    diff -u $expected $actual
-    if [ $? -ne 0 ]; then
-        failed=$((failed + 1))
-    fi
-}
-
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 # Write message with bogus header field (missing blank line, really).
-msgfile=$(mhpath new)
-msgnum=$(basename $msgfile)
+msgfile=`mhpath new`
+msgnum=`basename $msgfile`
 cat > $msgfile <<EOF
 Date: Sun, 18 Dec 2005 00:52:39 +0100
 From: foo@example.edu
@@ -43,8 +34,8 @@ EOF
 cat > $expected <<EOF
   11  12/18 foo@example.edu    test<<This is a multi-part message in MIME forma
 EOF
-scan $msgnum > $actual 2>&1
-check
+scan -width 80 $msgnum > $actual 2>&1
+check $expected $actual
 
 # check show (mhl)
 cat > $expected <<EOF
@@ -58,11 +49,10 @@ Subject: test
 
 This is a multi-part message in MIME format.
 
-
 I am a stupid spammer.
 EOF
 show $msgnum > $actual 2>&1
-check
+check $expected $actual
 
 # check mhshow
 cat > $expected <<EOF
@@ -79,6 +69,6 @@ This is a multi-part message in MIME format.
 I am a stupid spammer.
 EOF
 mhshow -nopause $msgnum > $actual 2>&1
-check
+check $expected $actual
 
 exit $failed