Subtracted 1 from size argument in some calls to strncpy(3).

[nmh] / test / format / test-mymbox

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 8efee5b64e97889f212bee62772bf84087bafd6d..6185e38855965b508dac48decd1a4b668a92d5cd 100755 (executable)
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,12 +13,14 @@ fi
 
 setup_test
 
 
 setup_test
 

-#### Use ap to get the username.  That will either be what's in the
-#### Local-Mailbox profile component, which we don't use in the 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`
+#### Remove existing Local-Mailbox: profile component, if any.
+grep -v 'Local-Mailbox: ' "$MH" > "$MH".new
+mv -f "$MH".new "$MH"
+
+user=`id -nu`
+set +e

 host=`${MH_OBJ_DIR}/test/getcanon`
 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"
 
 output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}"`
 run_test "echo $output" 1 "Basic user test"


@@ -29,10 +31,7 @@ run_test "${MH_LIBEXEC_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.bla
 
 myname="Random User <random@user.something.com>"
 
 
 myname="Random User <random@user.something.com>"
 

-#### Remove existing Local-Mailbox: profile component, if any.  Then
-#### add one.
-grep -v 'Local-Mailbox: ' "$MH" > "$MH".new
-mv -f "$MH".new "$MH"
+#### Add Local-Mailbox profile component.

 echo "Local-Mailbox: ${myname}" >> "$MH"
 
 run_test "echo \
 echo "Local-Mailbox: ${myname}" >> "$MH"
 
 run_test "echo \


@@ -40,7 +39,10 @@ run_test "echo \
          1 "Local-Mailbox test"
 
 output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
          1 "Local-Mailbox test"
 
 output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`

-run_test "echo $output" 0 "Local-mailbox overriding user@host test"
+run_test "echo $output" 0 "Local-Mailbox overriding user@host test"
+
+#### Test getusername() when there is a Local-Mailbox profile component.
+run_test 'fmttest -raw -format %(me) ""' "${user}"

 
 # Add an Alternate-Mailbox.  This caused ismymbox() to lose the
 # Local-Mailbox, Bug #36635: -nocc me doesn't account for
 
 # Add an Alternate-Mailbox.  This caused ismymbox() to lose the
 # Local-Mailbox, Bug #36635: -nocc me doesn't account for


@@ -70,4 +72,22 @@ run_test 'fmttest -message -format %(getmymbox{from}) first' \
 run_test 'fmttest -message -format %(getmyaddr{from}) first' \
          'test1@example.com'
 
 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
 exit $failed