mhlsbr.c: Don't strchr(3) non-string NUL-less buffer.

[nmh] / test / format / test-mymbox

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 8816cb692a31ab7d7872225cb1d6192c365650a1..a8f21dcbeb7477dbfe66e7607cbaf4cb8e0b118a 100755 (executable)
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -18,7 +18,9 @@ setup_test
 #### suite, or the user's login name.  ap will escape (quote) it if
 #### needed.
 user=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(me)' 0`
+set +e
 host=`${MH_OBJ_DIR}/test/getcanon`
+set -e
 
 output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}"`
 run_test "echo $output" 1 "Basic user test"
@@ -53,6 +55,9 @@ run_test "echo \
 # check getmymbox, without match
 run_test 'fmttest -message -format %(getmymbox{from}) first' ''
 
+# check getmyaddr, without match
+run_test 'fmttest -message -format %(getmyaddr{from}) first' ''
+
 grep -v 'Alternate-Mailboxes: ' "$MH" > "$MH".new
 mv -f "$MH".new "$MH"
 cat >>"$MH" <<EOF
@@ -61,6 +66,28 @@ EOF
 
 # check getmymbox, with match
 run_test 'fmttest -message -format %(getmymbox{from}) first' \
+         'Test1 <test1@example.com>'
+
+# check getmyaddr, with match
+run_test 'fmttest -message -format %(getmyaddr{from}) first' \
+         'test1@example.com'
+
+# check getmymbox and getmyaddr, with match of other than first address in
+#   component
+cat >`mhpath new` <<'EOF'
+From: Test11 <test11@example.com>
+Cc: Test0 <test0@example.com>, Test3 <test3@example.com>,
+    Test1 <test1@example.com>, Test2 <test2@example.com>
+To: Some User <user@example.com>
+Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 11@test.nmh
+Subject: Testing message 11
+
+This is message number 11
+EOF
+run_test 'fmttest -message -format %(getmymbox{cc}) last' \
+         'Test1 <test1@example.com>'
+run_test 'fmttest -message -format %(getmyaddr{cc}) last' \
          'test1@example.com'
 
 exit $failed