Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / test / rcv / test-rcvtty

diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty
index 6d61de212d4eae8633561d07424d90146c873378..4f1d4988ad4ebe0c6e31e220b1dc7ff53f3e17af 100755 (executable)
--- a/test/rcv/test-rcvtty
+++ b/test/rcv/test-rcvtty
@@ -17,7 +17,7 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-rcvtty="${MH_LIB_DIR}/rcvtty"
+rcvtty="${MH_LIBEXEC_DIR}/rcvtty"
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
@@ -37,13 +37,14 @@ Usage: rcvtty [command ...]
   -help
 EOF
 
-$rcvtty -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog "$rcvtty" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
 case `$rcvtty -v` in
   rcvtty\ --*) ;;
-  *          ) printf "$0: rcvtty -v generated unexpected output\n" >&2
+  *          ) printf '%s: rcvtty -v generated unexpected output\n' "$0" >&2
                failed=`expr ${failed:-0} + 1`;;
 esac
 
@@ -54,7 +55,7 @@ esac
 # any of their ttys.
 cat >"$expected" <<EOF
 EOF
-$rcvtty <${MH_TEST_DIR}/Mail/inbox/1 -biff >"$actual" 2>&1
+run_prog $rcvtty <${MH_TEST_DIR}/Mail/inbox/1 -biff >"$actual" 2>&1
 check "$expected" "$actual"