modify mhshow marker format to include the size of the part

diff --git a/etc/mhshow.marker b/etc/mhshow.marker
index 4df8e38..6e324b1 100644 (file)
--- a/etc/mhshow.marker
+++ b/etc/mhshow.marker
@@ -3,5 +3,5 @@
 %; used by mhshow when it decides to not display content.
 %;
 [ part %{part} - %{content-type} - %<{description}\
-%{description}%?{cdispo-filename}%{cdispo-filename}%|%{ctype-name}%> \
-%<(unseen)\(suppressed\)%> ]
+%{description}%?{cdispo-filename}%{cdispo-filename}%|%{ctype-name}%>  \
+%(units(size))B %<(unseen)\(suppressed\)%> ]

diff --git a/uip/conflict b/uip/conflict
new file mode 100755 (executable)
index 0000000..dbfb2fa
Binary files /dev/null and b/uip/conflict differ

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 679d8be..ce82d70 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -1222,9 +1222,11 @@ convert_content_charset (CT ct, char **file) {
  * Compile our format string and save any parameters we care about.
  */
 
-#define DEFAULT_MARKER "[ part %{part} - %{content-type} - %<{description}" \
-                      "%{description}%?{cdispo-filename}%{cdispo-filename}" \
-                      "%|%{ctype-name}%> %<(unseen)\\(suppressed\\)%> ]"
+#define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \
+                      "%<{description}%{description}" \
+                        "%?{cdispo-filename}%{cdispo-filename}" \
+                        "%|%{ctype-name}%>  " \
+                      "%(units(size))B %<(unseen)\\(suppressed\\)%> ]"
 
 static struct format *
 compile_marker(char *markerform)

diff --git a/uip/mhtest b/uip/mhtest
new file mode 100755 (executable)
index 0000000..26ac293
Binary files /dev/null and b/uip/mhtest differ

diff --git a/uip/msh b/uip/msh
new file mode 100755 (executable)
index 0000000..7648674
Binary files /dev/null and b/uip/msh differ