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

[nmh] / test / scan / test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index fb9747d64892fc36532bc0a74f30f5429897b396..bab76b6c1ad3b53a16c633b2f95f4bb3402a9c77 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -26,7 +26,7 @@ if test "${MULTIBYTE_ENABLED}" -ne 1; then
     test_skip "configure did not detect multibyte support"
 fi
 
-LC_ALL=en_US.UTF-8; export LC_ALL
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 #
 # Create a test message with RFC 2047 headers we can scan
@@ -65,11 +65,11 @@ actual="$MH_TEST_DIR/$$.actual"
 
 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
-  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"
@@ -104,7 +104,7 @@ if test "$ICONV_ENABLED" -eq 1; then
 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
 
@@ -132,13 +132,13 @@ else
     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
-  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