Replaced use of GNU sed extension.

diff --git a/test/ali/test-ali b/test/ali/test-ali
index 6cd9d0536ae3854441537499e705d090d5a66dab..41ddb956b16b70df0ad8d1d72ee263bca8dc0f99 100755 (executable)
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -38,7 +38,7 @@ Usage: ali [switches] aliases ...
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-ali -help | sed '/^$/Q' >"$actual" 2>&1
+ali -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/anno/test-anno b/test/anno/test-anno
index 6d45cacfdd30ebe82fe5c0541f836aad41eba252..3f8fe5b479063d50317513ce1a3d7ca4e6ecfdf8 100755 (executable)
--- a/test/anno/test-anno
+++ b/test/anno/test-anno
@@ -40,7 +40,7 @@ Usage: anno [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog anno -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog anno -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/dist/test-dist b/test/dist/test-dist
index fd0df96a1442648e84885343e70fa62255776995..dc27ae86e31d330a97a15086e426e40b046594a2 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -72,7 +72,7 @@ Usage: dist [+folder] [msg] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-dist -help | sed '/^$/Q' >"$actual" 2>&1
+dist -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/folder/test-packf b/test/folder/test-packf
index 91c4cb510209984d9b1443e4a39d18c553f9e084..4d4e4db164da6e4541f736739889a035290e6eb0 100755 (executable)
--- a/test/folder/test-packf
+++ b/test/folder/test-packf
@@ -32,7 +32,7 @@ Usage: packf [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-packf -help | sed '/^$/Q' >"$actual" 2>&1
+packf -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/folder/test-sortm b/test/folder/test-sortm
index 331eae7d53eb6a9fbd05aba785e5895f0ff4c9ea..e6c73bae45df80fad6066ca915b860f0517c04dd 100755 (executable)
--- a/test/folder/test-sortm
+++ b/test/folder/test-sortm
@@ -38,7 +38,7 @@ Usage: sortm [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog sortm -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog sortm -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/format/test-dp b/test/format/test-dp
index 2c5b99608f9d5ae889f8e7c22a3943cab135d46c..19e28c330a89c358a634ff296333868463a85f95 100755 (executable)
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -37,7 +37,7 @@ Usage: dp [switches] dates ...
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$dp" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$dp" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 5c822db3f9e3beb750ae25884642b88f2c8470f7..259e12a202cf9b0c5e338ecec7560bd17e2a22b7 100755 (executable)
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -36,7 +36,7 @@ Usage: fmtdump [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-"$fmtdump" -help | sed '/^$/Q' >"$actual" 2>&1
+"$fmtdump" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index fb9b945045f75237d1f58b11ab39fe727d2c3aaa..152b11c7913c1ca4f58175d02c00ee664fe047a2 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -71,7 +71,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog mhfixmsg -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog mhfixmsg -help | sed '/^$/,$d' >"$actual" 2>&1

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

diff --git a/test/mhical/test-mhical b/test/mhical/test-mhical
index af75cf87adee83ab7a5d5c98f103aca031f8bc6e..533270ed51ffc9edd76b0ea66cb3f20417ca0aba 100755 (executable)
--- a/test/mhical/test-mhical
+++ b/test/mhical/test-mhical
@@ -47,7 +47,7 @@ Usage: mhical [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog mhical -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog mhical -help | sed '/^$/,$d' >"$actual" 2>&1

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

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index 4d127e4e603d725f4a5dc63dd0b1794152c27f14..ac7bc86d9031007191f4635377e7c9e287e8ca4b 100755 (executable)
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -89,7 +89,7 @@ Usage: mhmail [-t(o)] addrs ... [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-mhmail -help | sed '/^$/Q' >"$actual" 2>&1
+mhmail -help | sed '/^$/,$d' >"$actual" 2>&1

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

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index b29cba15934007d42e12b5673fda00231d9d8cec..a7e76bf2afcd2bac8703d554cf2f41edbfa3d5ea 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -34,13 +34,7 @@ Usage: mhparam [profile-components] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-# ???? debug
-set +e
-mhparam -help
-echo now through sed:
-mhparam -help | sed '/^$/Q'
-# ???? debug
-mhparam -help | sed '/^$/Q' >"$actual" 2>&1
+mhparam -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index cf2ab5d7d949e009d24f616c2bf29c435d6254eb..d07e4148db4ccdc8654f65f1a407a44aed7d67d5 100755 (executable)
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -29,7 +29,7 @@ Usage: mhpath [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog mhpath -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog mhpath -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp
index 94ce05677776a2c605d85b0bb69d3c99db64d193..fcc8cd57284450219c34163ecdd2a943aee89e54 100755 (executable)
--- a/test/mkstemp/test-mkstemp
+++ b/test/mkstemp/test-mkstemp
@@ -48,7 +48,7 @@ else
 fi
 
 #### Skip nmh intro text.
 fi
 
 #### Skip nmh intro text.

-run_prog $mkstemp -h | sed '/^$/Q' >"$actual" 2>&1
+run_prog $mkstemp -h | sed '/^$/,$d' >"$actual" 2>&1

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

diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index 64ccd5e03d7abdb8045264e88c8d033a69a9faa4..4e2eb612c97e0d05318076b762c0ae4bd2022e93 100755 (executable)
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -90,7 +90,7 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog sendfiles -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog sendfiles -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter
index 704f9986469ea6dcb1620158488ed686bfc23a0b..1950903c3be7ce95f3c254a9ad7d7fe02bc37336 100755 (executable)
--- a/test/prompter/test-prompter
+++ b/test/prompter/test-prompter
@@ -36,7 +36,7 @@ Usage: prompter [switches] file
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog prompter -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog prompter -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index 720b1bfe3b5e7c3ce410b404273d8c26048ee0e7..21d5904e50aeb69e5c808a03a894dbe5a0ac9299 100755 (executable)
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -33,7 +33,7 @@ Usage: rcvdist [switches] [switches for postproc] address ...
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvdist" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvdist" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack
index 15272af76a3a22ffa3e06ac9e034dce07a76e4e8..b39ceaf03b1ea3a9161d5242598fb2239d518c92 100755 (executable)
--- a/test/rcv/test-rcvpack
+++ b/test/rcv/test-rcvpack
@@ -34,7 +34,7 @@ Usage: rcvpack [switches] file
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvpack" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvpack" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore
index 0f0ab0fe2660a11a687d7d824043f03034089c96..a49a3ccdc5f643c6c0610d28524e15be5fdcc022 100755 (executable)
--- a/test/rcv/test-rcvstore
+++ b/test/rcv/test-rcvstore
@@ -39,7 +39,7 @@ Usage: rcvstore [+folder] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvstore" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvstore" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty
index 800d0fba0c266469fdb1a63168de4990e6b1ea68..4f1d4988ad4ebe0c6e31e220b1dc7ff53f3e17af 100755 (executable)
--- a/test/rcv/test-rcvtty
+++ b/test/rcv/test-rcvtty
@@ -38,7 +38,7 @@ Usage: rcvtty [command ...]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvtty" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvtty" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/repl/test-repl b/test/repl/test-repl
index 6beea72a786b00e4febf52d1f29bc401e67c0457..3e014f6cf1366534b1cb4e39c48b7085eb1150aa 100755 (executable)
--- a/test/repl/test-repl
+++ b/test/repl/test-repl
@@ -56,7 +56,7 @@ Usage: repl: [+folder] [msg] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog repl -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog repl -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal
index 800a16f96672d3621db1808e17e8ecd28436b54f..394e15592d9e98edc5e6544e4fe2b8f04d12e926 100755 (executable)
--- a/test/slocal/test-slocal
+++ b/test/slocal/test-slocal
@@ -43,7 +43,7 @@ Usage: slocal [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog $slocal -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog $slocal -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version