More fixes (and tests) for the base64 encoder.

[nmh] / uip / mhlistsbr.c

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index a4e831a068014dd4baefaed342181bc719e7d2cf..9380c3d72655c67e0dc31afb326bd708ad13aac2 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -11,8 +11,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #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>
 #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
  */
 /*
  * 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        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"
 
 
 #define        LSTFMT2d2       "\t     %-65.65s\n"
 
 


@@ -108,40 +106,32 @@ list_switch (CT ct, int toplevel, int realsize, int verbose, int debug)
     switch (ct->c_type) {
        case CT_MULTIPART:
            return list_multi (ct, toplevel, realsize, verbose, debug);
     switch (ct->c_type) {
        case CT_MULTIPART:
            return list_multi (ct, toplevel, realsize, verbose, debug);

-           break;

 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return list_partial (ct, toplevel, realsize, verbose, debug);
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return list_partial (ct, toplevel, realsize, verbose, debug);

-                   break;

 
                case MESSAGE_EXTERNAL:
                    return list_external (ct, toplevel, realsize, verbose, debug);
 
                case MESSAGE_EXTERNAL:
                    return list_external (ct, toplevel, realsize, verbose, debug);

-                   break;

 
                case MESSAGE_RFC822:
                default:
                    return list_content (ct, toplevel, realsize, verbose, debug);
 
                case MESSAGE_RFC822:
                default:
                    return list_content (ct, toplevel, realsize, verbose, debug);

-                   break;

            }
            }

-           break;

 
        case CT_TEXT:
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
            return list_content (ct, toplevel, realsize, verbose, debug);
 
        case CT_TEXT:
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
            return list_content (ct, toplevel, realsize, verbose, debug);

-           break;

 
        case CT_APPLICATION:
            return list_application (ct, toplevel, realsize, verbose, debug);
 
        case CT_APPLICATION:
            return list_application (ct, toplevel, realsize, verbose, debug);

-           break;

 
        default:
            /* list_debug (ct); */
            adios (NULL, "unknown content type %d", ct->c_type);
 
        default:
            /* list_debug (ct); */
            adios (NULL, "unknown content type %d", ct->c_type);

-           break;

     }
 
     return 0;  /* NOT REACHED */
     }
 
     return 0;  /* NOT REACHED */


@@ -161,8 +151,11 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug)
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
     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);
     snprintf (buffer, sizeof(buffer), "%s/%s", empty (ci->ci_type),
                empty (ci->ci_subtype));
     printf (LSTFMT2b, empty (ct->c_partno), buffer);


@@ -198,8 +191,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug)
     if (ct->c_descr) {
        char *dp;
 
     if (ct->c_descr) {
        char *dp;
 

-       dp = trimcpy (cp = add (ct->c_descr, NULL));
-       free (cp);
+       dp = cpytrim (ct->c_descr);

        printf (LSTFMT2d1, dp);
        free (dp);
     }
        printf (LSTFMT2d1, dp);
        free (dp);
     }


@@ -220,8 +212,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug)
        if (ci->ci_comment) {
            char *dp;
 
        if (ci->ci_comment) {
            char *dp;
 

-           dp = trimcpy (cp = add (ci->ci_comment, NULL));
-           free (cp);
+           dp = cpytrim (ci->ci_comment);

            snprintf (buffer, sizeof(buffer), "(%s)", dp);
            free (dp);
            printf (LSTFMT2d2, buffer);
            snprintf (buffer, sizeof(buffer), "(%s)", dp);
            free (dp);
            printf (LSTFMT2d2, buffer);


@@ -282,7 +273,7 @@ list_debug (CT ct)
 
     /* print internal flags for transfer encoding */
     fprintf (stderr, "    transfer encoding 0x%x params 0x%x\n",
 
     /* 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)
 
     /* print Content-ID */
     if (ct->c_id)


@@ -424,12 +415,11 @@ list_application (CT ct, int toplevel, int realsize, int verbose, int debug)
 static int
 list_encoding (CT ct)
 {
 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;
 }
 
     return OK;
 }