fmt_scan() no longer subtracts 1 from the width. This has the effect

of no longer counting the trailing newline in the output of scan(1),
inc(1), and the other programs that rely on it.

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 81946359230b7bfeb1d376f8a4569434af301d91..941a13ed47021c31e5fc5676951d55eff32682a6 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -29,3 +29,7 @@ DEPRECATED FEATURES
 ---------
 BUG FIXES
 ---------
 ---------
 BUG FIXES
 ---------

+
+- The format scanner no longer subtracts 1 from the width.  This has the
+  effect of no longer counting the trailing newline in the output of
+  scan(1), inc(1), and the other programs that rely on the format scanner.

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 998d393853ad7f787f088a148b190c8d2d1fa432..47a5fe87ecb83ddc890617fc4ef979b0bba024a0 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -380,15 +380,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
     struct mailname *mn;
 
     /*
     struct mailname *mn;
 
     /*

-     * The newline counts in the display width, for backward
-     * compatibility.  To change that so that the newline doesn't
-     * count, remove the following statement.
-     */
-    --width;
-
-    /*
-     * max is the same as width, but unsigned.  So comparisons
-     * with charstring_chars() won't raise compile warning.
+     * max is the same as width, but unsigned so comparisons
+     * with charstring_chars() won't raise compile warnings.

      */
     max = width;
     savestr = str = NULL;
      */
     max = width;
     savestr = str = NULL;

diff --git a/test/bad-input/test-header b/test/bad-input/test-header
index 0666cdb91c06202e017c931ca20854257fdef1cc..1716ff1f1098ad6e3461e0a3c616986ed1bf520e 100755 (executable)
--- a/test/bad-input/test-header
+++ b/test/bad-input/test-header
@@ -35,7 +35,7 @@ EOF
 
 # check scan
 cat >"$expected" <<EOF
 
 # check scan
 cat >"$expected" <<EOF

-  11  12/18 foo@example.edu    test<<This is a multi-part message in MIME forma
+  11  12/18 foo@example.edu    test<<This is a multi-part message in MIME format

 EOF
 run_prog scan -width 80 last > "$actual" 2>&1
 check "$expected" "$actual"
 EOF
 run_prog scan -width 80 last > "$actual" 2>&1
 check "$expected" "$actual"


@@ -78,7 +78,7 @@ check "$expected" "$actual"
 msgfile="$MH_TEST_DIR/Mail/inbox/12"
 printf 'Date: Sat, 12 Jan 2013 09:07:01 -0600\nReceived:' >"$msgfile"
 cat >"$expected" <<EOF
 msgfile="$MH_TEST_DIR/Mail/inbox/12"
 printf 'Date: Sat, 12 Jan 2013 09:07:01 -0600\nReceived:' >"$msgfile"
 cat >"$expected" <<EOF

-  12  01/12 
+  12  01/12  

 EOF
 cat >"$expected_err" <<EOF
 scan: eof encountered in field "Received"
 EOF
 cat >"$expected_err" <<EOF
 scan: eof encountered in field "Received"


@@ -96,7 +96,7 @@ Date: Tue, 15 Jan 2013 21:13:12 -0600
 ThisHeaderFieldNameIsWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayTooLong: OK
 EOF
 cat >"$expected" <<EOF
 ThisHeaderFieldNameIsWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayTooLong: OK
 EOF
 cat >"$expected" <<EOF

-  13  01/15 
+  13  01/15  

 EOF
 
 run_prog scan -width 13 last >"$actual" 2>"$actual_err"
 EOF
 
 run_prog scan -width 13 last >"$actual" 2>"$actual_err"


@@ -127,7 +127,7 @@ Test
 
 EOF
 cat >"$expected" <<EOF
 
 EOF
 cat >"$expected" <<EOF

-  14  01/17 
+  14  01/17  

 EOF
 cat >"$expected_err" <<EOF
 scan: eol encountered in field "If a header field name has at least 512 characters without a newline or colon, it will raise a format error in m_getfld().  Here is a test of that.  01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901"
 EOF
 cat >"$expected_err" <<EOF
 scan: eol encountered in field "If a header field name has at least 512 characters without a newline or colon, it will raise a format error in m_getfld().  Here is a test of that.  01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901"

diff --git a/test/burst/test-burst b/test/burst/test-burst
index 938c0b56216ec7a85ec66b84fee80fd28a13efe7..fce125fee7c44b41e7b68b943b6c3877a9ee819b 100755 (executable)
--- a/test/burst/test-burst
+++ b/test/burst/test-burst
@@ -48,8 +48,8 @@ EOF
 
 run_prog burst 11 || exit
 
 
 run_prog burst 11 || exit
 

-run_test 'scan -width 80 11-last' \
-"  11  09/29 Test Burst Messag  Test digest<<------- Message one From: Mister Bu
+run_test 'scan -width 80 11-last' "\
+  11  09/29 Test Burst Messag  Test digest<<------- Message one From: Mister Bur

   12+ 09/28 Mister Burster     Message one<<This is message one >>
   13  09/28 Mister Burster     Message two<<This is message two For real. >>"
 
   12+ 09/28 Mister Burster     Message one<<This is message one >>
   13  09/28 Mister Burster     Message two<<This is message two For real. >>"
 


@@ -99,8 +99,8 @@ EOF
 
 run_prog burst 14 || exit
 
 
 run_prog burst 14 || exit
 

-run_test 'scan -width 80 14-last' \
-"  14  09/29 Test Burst Messag  Test digest<<This is a preamble ------- Message 
+run_test 'scan -width 80 14-last' "\
+  14  09/29 Test Burst Messag  Test digest<<This is a preamble ------- Message o

   15+ 09/28 Mister Burster     Message one<<-This is message one >>
   16  09/28 Mister Burster     Message two<<This is message two For real. >>
   17  09/28 Mister Burster     Message three<<Will this one work? >>"
   15+ 09/28 Mister Burster     Message one<<-This is message one >>
   16  09/28 Mister Burster     Message two<<This is message two For real. >>
   17  09/28 Mister Burster     Message three<<Will this one work? >>"

diff --git a/test/burst/test-burst-mime b/test/burst/test-burst-mime
index 46de62aa74e0a01adfb28f320cadb6249a695f13..9a07c0aba63e34b12b3f11efd770be8626006ace 100755 (executable)
--- a/test/burst/test-burst-mime
+++ b/test/burst/test-burst-mime
@@ -37,9 +37,10 @@ EOF
 
 run_prog burst 11
 
 
 run_prog burst 11
 

-run_test 'scan -width 80 11-last' \
-"  11  09/29 Test Burst Messag  Test MIME digest<<From: Mister Burster <burst2@e
-  12+ 09/28 Mister Burster     Message one<<- - This line should not be unstuff"
+run_test 'scan -width 80 11-last' "\
+  11  09/29 Test Burst Messag  Test MIME digest<<From: Mister Burster <burst2@ex
+  12+ 09/28 Mister Burster     Message one<<- - This line should not be unstuff\
+e"

 
 #
 # Create another test message that does multipart/digest checking
 
 #
 # Create another test message that does multipart/digest checking


@@ -88,8 +89,8 @@ EOF
 
 run_prog burst 14 || exit
 
 
 run_prog burst 14 || exit
 

-run_test 'scan -width 80 14-last' \
-"  14  09/29 Test Burst Messag  Test digest<<This is a preamble ------- =_aaaaaa
+run_test 'scan -width 80 14-last' "\
+  14  09/29 Test Burst Messag  Test digest<<This is a preamble ------- =_aaaaaaa

   15+ 09/28 Mister Burster     Message one<<- -This is message one >>
   16  09/28 Mister Burster     Message two<<This is message two - For real.>>
   17  09/28 Mister Burster     Message three<<Will this one work? >>"
   15+ 09/28 Mister Burster     Message one<<- -This is message one >>
   16  09/28 Mister Burster     Message two<<This is message two - For real.>>
   17  09/28 Mister Burster     Message three<<Will this one work? >>"

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 155f773301d42900f6926adc096449d4edff0a41..0d0d7b04361ca59e3f80fa4500176a2bf56f85d8 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -366,7 +366,7 @@ This is message number 1
 EOF
 
 test_dist 1 -noedit -to somebody@example.com -fcc outbox
 EOF
 
 test_dist 1 -noedit -to somebody@example.com -fcc outbox

-run_test 'scan +outbox -width 6' '   1 '
+run_test 'scan +outbox -width 6' '   1  '

 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>


@@ -382,7 +382,7 @@ This is message number 1
 EOF
 
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox
 EOF
 
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox

-run_test 'scan +outbox -width 6 2' '   2 '
+run_test 'scan +outbox -width 6 2' '   2  '

 
 #
 # Check that dist encodes headers using RFC-2047 properly
 
 #
 # Check that dist encodes headers using RFC-2047 properly

diff --git a/test/format/test-dp b/test/format/test-dp
index fb3cc917825f7c449dac739749995cb1941c51dc..43a39e91f408a698ef4434a4ead30ce290109a58 100755 (executable)
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -105,7 +105,7 @@ check $expected $actual
 
 # check -width
 cat >"$expected" <<EOF
 
 # check -width
 cat >"$expected" <<EOF

-Sun, 01 Jul 2012
+Sun, 01 Jul 2012 

 EOF
 
 run_prog $dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1
 EOF
 
 run_prog $dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1

diff --git a/test/inc/test-inc-scanout b/test/inc/test-inc-scanout
index 140b54c0f5b757d3123e386987c6992c1ffc4643..1d8145496b9af20b23c4144b9deed07103457029 100755 (executable)
--- a/test/inc/test-inc-scanout
+++ b/test/inc/test-inc-scanout
@@ -191,13 +191,13 @@ EOF
 run_test "inc -file ${MH_TEST_DIR}/test.mbox -width 120 -truncate" \
        "Incorporating new mail into inbox...
 
 run_test "inc -file ${MH_TEST_DIR}/test.mbox -width 120 -truncate" \
        "Incorporating new mail into inbox...
 

-  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cos"
+  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cost"

 
 check `mhpath +inbox 11` "${MH_TEST_DIR}/test.mbox.2" "keep first"
 rm -f "${MH_TEST_DIR}/test.mbox" "${MH_TEST_DIR}/test.mbox.2"
 
 run_test "scan -width 120 +inbox 11" \
 
 check `mhpath +inbox 11` "${MH_TEST_DIR}/test.mbox.2" "keep first"
 rm -f "${MH_TEST_DIR}/test.mbox" "${MH_TEST_DIR}/test.mbox.2"
 
 run_test "scan -width 120 +inbox 11" \

-       "  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cos"
+       "  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cost"

 
 # check header field name with ':' character than lands on m_getfld() buffer
 cat >"$MH_TEST_DIR/mess" <<EOF
 
 # check header field name with ':' character than lands on m_getfld() buffer
 cat >"$MH_TEST_DIR/mess" <<EOF


@@ -346,7 +346,7 @@ run_test "scan -width 80 -file $MH_TEST_DIR/msgbox" \
    8  09/29 Test8              Testing message 8<<This is message number 8 >>
    9  09/29 Test9              Testing message 9<<This is message number 9 >>
   10  09/29 Test10             Testing message 10<<This is message number 10 >>
    8  09/29 Test8              Testing message 8<<This is message number 8 >>
    9  09/29 Test9              Testing message 9<<This is message number 9 >>
   10  09/29 Test10             Testing message 10<<This is message number 10 >>

-  11  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. An
+  11  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And

   12  12/18 foo@example.edu    test'
 run_test "inc -width 80 -file $MH_TEST_DIR/msgbox -truncate" \
 'Incorporating new mail into inbox...
   12  12/18 foo@example.edu    test'
 run_test "inc -width 80 -file $MH_TEST_DIR/msgbox -truncate" \
 'Incorporating new mail into inbox...


@@ -361,7 +361,7 @@ run_test "inc -width 80 -file $MH_TEST_DIR/msgbox -truncate" \
   20  09/29 Test8              Testing message 8<<This is message number 8 >>
   21  09/29 Test9              Testing message 9<<This is message number 9 >>
   22  09/29 Test10             Testing message 10<<This is message number 10 >>
   20  09/29 Test8              Testing message 8<<This is message number 8 >>
   21  09/29 Test9              Testing message 9<<This is message number 9 >>
   22  09/29 Test10             Testing message 10<<This is message number 10 >>

-  23  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. An
+  23  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And

   24  12/18 foo@example.edu    test'
 rm -f  "$MH_TEST_DIR/msgbox"
 
   24  12/18 foo@example.edu    test'
 rm -f  "$MH_TEST_DIR/msgbox"
 

diff --git a/test/inc/test-pop b/test/inc/test-pop
index 73c31a87d972234125f1db072d8d0f7f29ff7419..4f92644b53c2704f483acde814d53f19058decee 100755 (executable)
--- a/test/inc/test-pop
+++ b/test/inc/test-pop
@@ -76,7 +76,8 @@ pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
        "Incorporating new mail into inbox...
 
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
        "Incorporating new mail into inbox...
 

-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do\
+i"

 check "$testmessage" `mhpath +inbox 11` 'keep first'
 
 # Check multiple messages at once
 check "$testmessage" `mhpath +inbox 11` 'keep first'
 
 # Check multiple messages at once


@@ -88,8 +89,8 @@ pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
        "Incorporating new mail into inbox...
 
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
        "Incorporating new mail into inbox...
 

-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do
-  12  12/18 A Real User        Anything new?<<What's been happening at your pla
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're doi
+  12  12/18 A Real User        Anything new?<<What's been happening at your plac

   13  12/19 Nathan Explosion   Brutal<<Dude, nmh is totally brutal. >>"
 
 check "$testmessage" `mhpath +inbox 11` 'keep first'
   13  12/19 Nathan Explosion   Brutal<<Dude, nmh is totally brutal. >>"
 
 check "$testmessage" `mhpath +inbox 11` 'keep first'


@@ -105,11 +106,13 @@ run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80 \
           -pack $MH_TEST_DIR/inc.mbox" \
        "Incorporating new mail into (null)...
 
           -pack $MH_TEST_DIR/inc.mbox" \
        "Incorporating new mail into (null)...
 

-   1  12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
+   1  12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do\
+i"

 run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 80" \
        "Incorporating new mail into inbox...
 
 run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 80" \
        "Incorporating new mail into inbox...
 

-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do\
+i"

 
 check $testmessage `mhpath +inbox 11` 'keep first'
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"
 
 check $testmessage `mhpath +inbox 11` 'keep first'
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"


@@ -133,11 +136,11 @@ run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 65 \
           -pack $MH_TEST_DIR/inc.mbox" \
        "Incorporating new mail into (null)...
 
           -pack $MH_TEST_DIR/inc.mbox" \
        "Incorporating new mail into (null)...
 

-   1  12/17 No Such User       Hello<<Hey man, how's it going? ." </dev/null
+   1  12/17 No Such User       Hello<<Hey man, how's it going? . " </dev/null

 run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 65" \
        "Incorporating new mail into inbox...
 
 run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 65" \
        "Incorporating new mail into inbox...
 

-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? ." </dev/null
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . " </dev/null

 
 check $testmessage `mhpath +inbox 11`
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"
 
 check $testmessage `mhpath +inbox 11`
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"

diff --git a/test/locking/test-spoollocking b/test/locking/test-spoollocking
index c5a420ead0b393ba13323eec22ef5e4fb740846a..7edc16bea831e1461ea568af8aaf4e2f38c327b2 100755 (executable)
--- a/test/locking/test-spoollocking
+++ b/test/locking/test-spoollocking
@@ -43,7 +43,7 @@ do
     run_test "inc -notruncate -width 80 -file $testmessage" \
 "Incorporating new mail into inbox...
 
     run_test "inc -notruncate -width 80 -file $testmessage" \
 "Incorporating new mail into inbox...
 

-  11+ 12/17 No Such User       Hello, how are you?<<This is a test; will it wor
+  11+ 12/17 No Such User       Hello, how are you?<<This is a test; will it work

 $testmessage not zero'd"
 
     rmm 11
 $testmessage not zero'd"
 
     rmm 11

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index f64661413fb24eacbdebbd2286c4492b3c8f40ad..3ce5df76e02bd15149176b06c0c6351c99a7f8e0 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -66,11 +66,11 @@ actual="$MH_TEST_DIR/$$.actual"
 
 if test "$width" -eq 3; then
 cat > "$expected" <<EOF
 
 if test "$width" -eq 3; then
 cat > "$expected" <<EOF

-  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are look
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki

 EOF
 elif test "$width" -eq 2; then
 cat > "$expected" <<EOF
 EOF
 elif test "$width" -eq 2; then
 cat > "$expected" <<EOF

-  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are lookin

 EOF
 else
     echo "Unsupported width for UTF-8 test string: $width"
 EOF
 else
     echo "Unsupported width for UTF-8 test string: $width"


@@ -105,7 +105,7 @@ if test "$ICONV_ENABLED" -eq 1; then
 EOF
 
     # Don't use run_prog here because it loses the environment setting.
 EOF
 
     # Don't use run_prog here because it loses the environment setting.

-    LC_ALL=C scan -width 75 last >"$actual"
+    LC_ALL=C scan -width 74 last >"$actual"

     check "$expected" "$actual"
 fi
 
     check "$expected" "$actual"
 fi
 


@@ -133,13 +133,13 @@ else
     echo "Unsupported width for U+2019: $width"
 fi
 
     echo "Unsupported width for U+2019: $width"
 fi
 

-run_prog scan -width 75 last >"$actual"
+run_prog scan -width 74 last >"$actual"

 check "$expected" "$actual"
 
 
 if test "$ICONV_ENABLED" -eq 1; then
   cat >"$expected" <<EOF
 check "$expected" "$actual"
 
 
 if test "$ICONV_ENABLED" -eq 1; then
   cat >"$expected" <<EOF

-  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92.
+  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92. 

 EOF
 
   cat >"${MH_TEST_DIR}/Mail/inbox/13" <<EOF
 EOF
 
   cat >"${MH_TEST_DIR}/Mail/inbox/13" <<EOF