Added mention to mhlist(1) man page, in response to question

from Ralph, that it lists multipart/alternative parts in reverse
order of their placement in a message.

And in response to suggestion from Ralph, trimmed whitespace from
ends of mhlist output lines.

diff --git a/man/mhlist.man b/man/mhlist.man
index f6e752eff37721ef717a123c524e198e420d3078..d8241ae2997d351c65df57bdf26c816d7a8ee260 100644 (file)
--- a/man/mhlist.man
+++ b/man/mhlist.man
@@ -142,6 +142,10 @@ act on a message/external-body content, then the
 switch must
 be used twice: once for message/external-body and once for the content
 externally referenced.
+.PP
+The parts of a multipart/alternative part are listed in the reverse
+order of their placement in the message.  The listing therefore is
+in decreasing order of preference, as defined in RFC 1521.
 .SS "Checking the Contents"
 The
 .B \-check

diff --git a/test/mhlist/test-mhlist b/test/mhlist/test-mhlist
index 058819966cd8b934a9b502097d9baefaedd7493f..cb793670d512b6fc8ecedcb4a1cfde46782939f9 100755 (executable)
--- a/test/mhlist/test-mhlist
+++ b/test/mhlist/test-mhlist
@@ -26,7 +26,7 @@ run_test 'mhlist' 'mhlist: no cur message'
 # check with no options and current message
 folder +inbox 5 > /dev/null
 cat > $expected <<EOF
- msg part  type/subtype              size description                         
+ msg part  type/subtype              size description
    5       text/plain                  25
 EOF
 mhlist > $actual 2>&1
@@ -53,7 +53,7 @@ check $expected $actual
 
 # check -file -
 cat > $expected <<EOF
- msg part  type/subtype              size description                         
+ msg part  type/subtype              size description
    0       text/plain                  25
 EOF
 mhlist -file - < "$MH_TEST_DIR/Mail/inbox/5" > $actual 2>&1
@@ -64,7 +64,7 @@ run_test 'mhlist 11' "mhlist: message 11 doesn't exist"
 
 # check multiple messages
 cat > $expected <<EOF
- msg part  type/subtype              size description                         
+ msg part  type/subtype              size description
    2       text/plain                  25
    8       text/plain                  25
 EOF

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index fe3d069627036d9df32857879cb7cb3932a2bbb1..3c36871006bc624223df96dedabf1375f8bd3224 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -44,14 +44,14 @@ static int list_encoding (CT);
 /*
  * various formats for -list option
  */
-#define        LSTFMT1         "%4s %-5s %-24s %5s %-36s\n"
+#define        LSTFMT1         "%4s %-5s %-24s %5s %s\n"
 #define        LSTFMT2a        "%4d "
 #define        LSTFMT2b        "%-5s %-24.24s "
 #define        LSTFMT2c1       "%5lu"
 #define        LSTFMT2c2       "%4lu%c"
 #define        LSTFMT2c3       "huge "
 #define        LSTFMT2c4       "     "
-#define        LSTFMT2d1       " %-36.36s"
+#define        LSTFMT2d1       " %.36s"
 #define        LSTFMT2d2       "\t     %-65.65s\n"