Index: mailutils-0.6/imap4d/testsuite/imap4d/list.exp
===================================================================
--- mailutils-0.6/imap4d/testsuite/imap4d/list.exp	{cset 34f044ee-0c36-4261-8435-3db580301cea}
+++ mailutils-0.6/imap4d/testsuite/imap4d/list.exp	{local clone}
@@ -20,25 +20,31 @@ imap4d_start 
 imap4d_auth "user!passwd" "guessme"
 
 imap4d_test "LIST \"~\" \"*\""\
-"LIST (\\NoInferiors) \"/\" ~/mbox1"\
 "LIST (\\NoInferiors) \"/\" ~/mbox"\
-"LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/mbox1"\
 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/relational.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
 "OK LIST Completed"
 
 imap4d_test "LIST \"~\" \"%\""\
-"LIST (\\NoInferiors) \"/\" ~/mbox1"\
 "LIST (\\NoInferiors) \"/\" ~/mbox"\
-"LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/mbox1"\
 "LIST (\\NoInferiors) \"/\" ~/teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/relational.mbox"\
+"LIST (\\NoInferiors) \"/\" ~/sieve.mbox"\
 "OK LIST Completed"
 
 imap4d_test "LIST \"\" \"*\""\
 "LIST (\\NoInferiors) NIL INBOX"\
-"LIST (\\NoInferiors) \"/\" mbox1"\
 "LIST (\\NoInferiors) \"/\" mbox"\
-"LIST (\\NoInferiors) \"/\" sieve.mbox"\
+"LIST (\\NoInferiors) \"/\" mbox1"\
 "LIST (\\NoInferiors) \"/\" teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" relational.mbox"\
+"LIST (\\NoInferiors) \"/\" sieve.mbox"\
 "OK LIST Completed"
 
 imap4d_test "LIST \"/\" \"*\""\
@@ -49,10 +55,12 @@ imap4d_test "LIST \"$MU_DATA_DIR\" \"*\"
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/mail.rc"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/etc/passwd"\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/spool"\
-"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox1"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox"\
-"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/sieve.mbox"\
+"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/mbox1"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/teaparty.mbox"\
+"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/bigto.mbox"\
+"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/relational.mbox"\
+"LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/spool/sieve.mbox"\
 "LIST (\\NoSelect) \"/\" $MU_DATA_DIR/folder"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/one"\
 "LIST (\\NoInferiors) \"/\" $MU_DATA_DIR/folder/two"\
Index: mailutils-0.6/readmsg/readmsg.c
===================================================================
--- mailutils-0.6/readmsg/readmsg.c	{cset eb17c21c-7173-41f8-be24-d1b6242b1826}
+++ mailutils-0.6/readmsg/readmsg.c	{local clone}
@@ -88,11 +88,11 @@ readmsg_parse_opt (int key, char *arg, s
       break;
 
     case 'f':
-      mailbox_name = optarg;
+      mailbox_name = arg;
       break;
 
     case 'w':
-      weedlist = optarg;
+      weedlist = arg;
       break;
 
     case 'n':
# Checksums: MD5
# d972482894f225db9beabaaef371ee84  imap4d/testsuite/imap4d/list.exp
# 43c7158a3320bca31f2c019e1b7823ec  imap4d/testsuite/imap4d/list.exp [diff]
# bc35a01a5aa4d50d5b7233e317074571  readmsg/readmsg.c
# 0bf814e4cde42a47fd2a75126db630e9  readmsg/readmsg.c [diff]