X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1c570cbefde061bf4aee1d0ab99bebb9fab40846..fed2a57e7333c5f76875d44ccc8abafccd5594ef:/uip/mhlistsbr.c

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index bc29243b..0b4e439f 100644
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -11,8 +11,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -46,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"
 
 
@@ -161,8 +159,11 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug)
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
-    printf (toplevel > 0 ? LSTFMT2a : toplevel < 0 ? "part " : "     ",
-	    atoi (r1bindex (empty (ct->c_file), '/')));
+    if (toplevel > 0)
+    	printf (LSTFMT2a, atoi (r1bindex (empty (ct->c_file), '/')));
+    else
+    	printf(toplevel < 0 ? "part " : "     ");
+
     snprintf (buffer, sizeof(buffer), "%s/%s", empty (ci->ci_type),
 		empty (ci->ci_subtype));
     printf (LSTFMT2b, empty (ct->c_partno), buffer);
@@ -280,7 +281,7 @@ list_debug (CT ct)
 
     /* print internal flags for transfer encoding */
     fprintf (stderr, "    transfer encoding 0x%x params 0x%x\n",
-	     ct->c_encoding, (unsigned int)(unsigned long) ct->c_cefile);
+	     ct->c_encoding, (unsigned int)(unsigned long) &ct->c_cefile);
 
     /* print Content-ID */
     if (ct->c_id)
@@ -422,12 +423,11 @@ list_application (CT ct, int toplevel, int realsize, int verbose, int debug)
 static int
 list_encoding (CT ct)
 {
-    CE ce;
+    CE ce = &ct->c_cefile;
 
-    if ((ce = ct->c_cefile))
-	fprintf (stderr, "    decoded fp 0x%x file \"%s\"\n",
-		 (unsigned int)(unsigned long) ce->ce_fp,
-		 ce->ce_file ? ce->ce_file : "");
+    fprintf (stderr, "    decoded fp 0x%x file \"%s\"\n",
+	     (unsigned int)(unsigned long) ce->ce_fp,
+	     ce->ce_file ? ce->ce_file : "");
 
     return OK;
 }