X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a5aa6164d9e9c178c800187fa606f83c1bac916f..a3724ed3:/uip/mhlistsbr.c diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c index 45aa89f0..f7ecbc89 100644 --- a/uip/mhlistsbr.c +++ b/uip/mhlistsbr.c @@ -1,6 +1,4 @@ - -/* - * mhlistsbr.c -- routines to list information about the +/* mhlistsbr.c -- routines to list information about the * -- contents of MIME messages * * This code is Copyright (c) 2002, by the authors of nmh. See the @@ -10,7 +8,6 @@ #include #include -#include #include #include #include @@ -18,26 +15,19 @@ #include /* mhmisc.c */ -int part_ok (CT, int); +int part_ok (CT); int type_ok (CT, int); void flush_errors (void); -/* - * prototypes - */ -void list_all_messages (CT *, int, int, int, int); -int list_switch (CT, int, int, int, int); -int list_content (CT, int, int, int, int); - /* * static prototypes */ -static void list_single_message (CT, int, int, int); +static void list_single_message (CT, int, int, int, int); static int list_debug (CT); -static int list_multi (CT, int, int, int, int); -static int list_partial (CT, int, int, int, int); -static int list_external (CT, int, int, int, int); -static int list_application (CT, int, int, int, int); +static int list_multi (CT, int, int, int, int, int); +static int list_partial (CT, int, int, int, int, int); +static int list_external (CT, int, int, int, int, int); +static int list_application (CT, int, int, int, int, int); static int list_encoding (CT); @@ -47,12 +37,14 @@ static int list_encoding (CT); #define LSTFMT1 "%4s %-5s %-24s %5s %s\n" #define LSTFMT2a "%4d " #define LSTFMT2b "%-5s %-24.24s " +#define LSTFMT2bv "%-5s %-24s " #define LSTFMT2c1 "%5lu" #define LSTFMT2c2 "%4lu%c" #define LSTFMT2c3 "huge " #define LSTFMT2c4 " " #define LSTFMT2d1 " %.36s" -#define LSTFMT2d2 "\t %-65.65s\n" +#define LSTFMT2d1v " %s" +#define LSTFMT2d2 "\t %-65s\n" /* @@ -60,7 +52,8 @@ static int list_encoding (CT); */ void -list_all_messages (CT *cts, int headers, int realsize, int verbose, int debug) +list_all_messages (CT *cts, int headers, int realsize, int verbose, int debug, + int dispo) { CT ct, *ctp; @@ -69,7 +62,7 @@ list_all_messages (CT *cts, int headers, int realsize, int verbose, int debug) for (ctp = cts; *ctp; ctp++) { ct = *ctp; - list_single_message (ct, realsize, verbose, debug); + list_single_message (ct, realsize, verbose, debug, dispo); } flush_errors (); @@ -81,11 +74,11 @@ list_all_messages (CT *cts, int headers, int realsize, int verbose, int debug) */ static void -list_single_message (CT ct, int realsize, int verbose, int debug) +list_single_message (CT ct, int realsize, int verbose, int debug, int dispo) { if (type_ok (ct, 1)) { umask (ct->c_umask); - list_switch (ct, 1, realsize, verbose, debug); + list_switch (ct, 1, realsize, verbose, debug, dispo); if (ct->c_fp) { fclose (ct->c_fp); ct->c_fp = NULL; @@ -101,64 +94,69 @@ list_single_message (CT ct, int realsize, int verbose, int debug) */ int -list_switch (CT ct, int toplevel, int realsize, int verbose, int debug) +list_switch (CT ct, int toplevel, int realsize, int verbose, int debug, + int dispo) { switch (ct->c_type) { case CT_MULTIPART: - return list_multi (ct, toplevel, realsize, verbose, debug); + return list_multi (ct, toplevel, realsize, verbose, debug, dispo); case CT_MESSAGE: switch (ct->c_subtype) { case MESSAGE_PARTIAL: - return list_partial (ct, toplevel, realsize, verbose, debug); + return list_partial (ct, toplevel, realsize, verbose, + debug, dispo); case MESSAGE_EXTERNAL: - return list_external (ct, toplevel, realsize, verbose, debug); + return list_external (ct, toplevel, realsize, verbose, + debug, dispo); case MESSAGE_RFC822: default: - return list_content (ct, toplevel, realsize, verbose, debug); + return list_content (ct, toplevel, realsize, verbose, + debug, dispo); } case CT_TEXT: case CT_AUDIO: case CT_IMAGE: case CT_VIDEO: - return list_content (ct, toplevel, realsize, verbose, debug); + return list_content (ct, toplevel, realsize, verbose, debug, dispo); case CT_APPLICATION: - return list_application (ct, toplevel, realsize, verbose, debug); - default: - /* list_debug (ct); */ - adios (NULL, "unknown content type %d", ct->c_type); + return list_application (ct, toplevel, realsize, verbose, debug, + dispo); } return 0; /* NOT REACHED */ } -#define empty(s) ((s) ? (s) : "") - /* * Method for listing information about a simple/generic content */ int -list_content (CT ct, int toplevel, int realsize, int verbose, int debug) +list_content (CT ct, int toplevel, int realsize, int verbose, int debug, + int dispo) { unsigned long size; char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; + PM pm; if (toplevel > 0) - printf (LSTFMT2a, atoi (r1bindex (empty (ct->c_file), '/'))); + printf (LSTFMT2a, atoi (r1bindex (FENDNULL(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", FENDNULL(ci->ci_type), + FENDNULL(ci->ci_subtype)); + if (verbose) + printf (LSTFMT2bv, FENDNULL(ct->c_partno), buffer); + else + printf (LSTFMT2b, FENDNULL(ct->c_partno), buffer); if (ct->c_cesizefnx && realsize) size = (*ct->c_cesizefnx) (ct); @@ -166,7 +164,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug) size = ct->c_end - ct->c_begin; /* find correct scale for size (Kilo/Mega/Giga/Tera) */ - for (cp = " KMGT"; size > 9999; size >>= 10) + for (cp = " KMGT"; size > 9999; size /= 1000) if (!*++cp) break; @@ -192,15 +190,17 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug) char *dp; dp = cpytrim (ct->c_descr); - printf (LSTFMT2d1, dp); + if (verbose) + printf (LSTFMT2d1v, dp); + else + printf (LSTFMT2d1, dp); free (dp); } - printf ("\n"); + putchar('\n'); if (verbose) { CI ci = &ct->c_ctinfo; - PM pm; for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) { printf ("\t %s=\"%s\"\n", pm->pm_name, @@ -221,6 +221,17 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug) } } + if (dispo && ct->c_dispo_type) { + printf ("\t disposition \"%s\"\n", ct->c_dispo_type); + + if (verbose) { + for (pm = ct->c_dispo_first; pm; pm = pm->pm_next) { + printf ("\t %s=\"%s\"\n", pm->pm_name, + get_param_value(pm, '?')); + } + } + } + if (debug) list_debug (ct); @@ -239,7 +250,7 @@ list_debug (CT ct) PM pm; fflush (stdout); - fprintf (stderr, " partno \"%s\"\n", empty (ct->c_partno)); + fprintf (stderr, " partno \"%s\"\n", FENDNULL(ct->c_partno)); /* print MIME-Version line */ if (ct->c_vrsn) @@ -250,24 +261,25 @@ list_debug (CT ct) fprintf (stderr, " %s:%s\n", TYPE_FIELD, ct->c_ctline); /* print parsed elements of content type */ - fprintf (stderr, " type \"%s\"\n", empty (ci->ci_type)); - fprintf (stderr, " subtype \"%s\"\n", empty (ci->ci_subtype)); - fprintf (stderr, " comment \"%s\"\n", empty (ci->ci_comment)); - fprintf (stderr, " magic \"%s\"\n", empty (ci->ci_magic)); + fprintf (stderr, " type \"%s\"\n", FENDNULL(ci->ci_type)); + fprintf (stderr, " subtype \"%s\"\n", FENDNULL(ci->ci_subtype)); + fprintf (stderr, " comment \"%s\"\n", FENDNULL(ci->ci_comment)); + fprintf (stderr, " magic \"%s\"\n", FENDNULL(ci->ci_magic)); /* print parsed parameters attached to content type */ fprintf (stderr, " parameters\n"); for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) - fprintf (stderr, " %s=\"%s\"\n", pm->pm_name, get_param_value(pm)); + fprintf (stderr, " %s=\"%s\"\n", pm->pm_name, + get_param_value(pm, '?')); /* print internal flags for type/subtype */ fprintf (stderr, " type 0x%x subtype 0x%x params 0x%x\n", ct->c_type, ct->c_subtype, (unsigned int)(unsigned long) ct->c_ctparams); - fprintf (stderr, " showproc \"%s\"\n", empty (ct->c_showproc)); - fprintf (stderr, " termproc \"%s\"\n", empty (ct->c_termproc)); - fprintf (stderr, " storeproc \"%s\"\n", empty (ct->c_storeproc)); + fprintf (stderr, " showproc \"%s\"\n", FENDNULL(ct->c_showproc)); + fprintf (stderr, " termproc \"%s\"\n", FENDNULL(ct->c_termproc)); + fprintf (stderr, " storeproc \"%s\"\n", FENDNULL(ct->c_storeproc)); /* print transfer encoding information */ if (ct->c_celine) @@ -285,8 +297,18 @@ list_debug (CT ct) if (ct->c_descr) fprintf (stderr, " %s:%s", DESCR_FIELD, ct->c_descr); + /* print Content-Disposition */ + if (ct->c_dispo) + fprintf (stderr, " %s:%s", DISPO_FIELD, ct->c_dispo); + + fprintf(stderr, " disposition \"%s\"\n", FENDNULL(ct->c_dispo_type)); + fprintf(stderr, " disposition parameters\n"); + for (pm = ct->c_dispo_first; pm; pm = pm->pm_next) + fprintf (stderr, " %s=\"%s\"\n", pm->pm_name, + get_param_value(pm, '?')); + fprintf (stderr, " read fp 0x%x file \"%s\" begin %ld end %ld\n", - (unsigned int)(unsigned long) ct->c_fp, empty (ct->c_file), + (unsigned int)(unsigned long) ct->c_fp, FENDNULL(ct->c_file), ct->c_begin, ct->c_end); /* print more information about transfer encoding */ @@ -295,28 +317,27 @@ list_debug (CT ct) return OK; } -#undef empty - /* * list content information for type "multipart" */ static int -list_multi (CT ct, int toplevel, int realsize, int verbose, int debug) +list_multi (CT ct, int toplevel, int realsize, int verbose, int debug, + int dispo) { struct multipart *m = (struct multipart *) ct->c_ctparams; struct part *part; /* list the content for toplevel of this multipart */ - list_content (ct, toplevel, realsize, verbose, debug); + list_content (ct, toplevel, realsize, verbose, debug, dispo); /* now list for all the subparts */ for (part = m->mp_parts; part; part = part->mp_next) { CT p = part->mp_part; - if (part_ok (p, 1) && type_ok (p, 1)) - list_switch (p, 0, realsize, verbose, debug); + if (part_ok (p) && type_ok (p, 1)) + list_switch (p, 0, realsize, verbose, debug, dispo); } return OK; @@ -328,16 +349,17 @@ list_multi (CT ct, int toplevel, int realsize, int verbose, int debug) */ static int -list_partial (CT ct, int toplevel, int realsize, int verbose, int debug) +list_partial (CT ct, int toplevel, int realsize, int verbose, int debug, + int dispo) { struct partial *p = (struct partial *) ct->c_ctparams; - list_content (ct, toplevel, realsize, verbose, debug); + list_content (ct, toplevel, realsize, verbose, debug, dispo); if (verbose) { printf ("\t [message %s, part %d", p->pm_partid, p->pm_partno); if (p->pm_maxno) printf (" of %d", p->pm_maxno); - printf ("]\n"); + puts("]"); } return OK; @@ -349,7 +371,8 @@ list_partial (CT ct, int toplevel, int realsize, int verbose, int debug) */ static int -list_external (CT ct, int toplevel, int realsize, int verbose, int debug) +list_external (CT ct, int toplevel, int realsize, int verbose, int debug, + int dispo) { struct exbody *e = (struct exbody *) ct->c_ctparams; @@ -357,7 +380,7 @@ list_external (CT ct, int toplevel, int realsize, int verbose, int debug) * First list the information for the * message/external content itself. */ - list_content (ct, toplevel, realsize, verbose, debug); + list_content (ct, toplevel, realsize, verbose, debug, dispo); if (verbose) { if (e->eb_name) @@ -370,6 +393,8 @@ list_external (CT ct, int toplevel, int realsize, int verbose, int debug) printf ("\t server=\"%s\"\n", e->eb_server); if (e->eb_subject) printf ("\t subject=\"%s\"\n", e->eb_subject); + if (e->eb_url) + printf ("\t url=\"%s\"\n", e->eb_url); /* This must be defined */ printf ("\t access-type=\"%s\"\n", e->eb_access); @@ -380,14 +405,15 @@ list_external (CT ct, int toplevel, int realsize, int verbose, int debug) printf ("\t permission=\"%s\"\n", e->eb_permission); if (e->eb_flags == NOTOK) - printf ("\t [service unavailable]\n"); + puts("\t [service unavailable]"); + } /* * Now list the information for the external content * to which this content points. */ - list_content (e->eb_content, 0, realsize, verbose, debug); + list_content (e->eb_content, 0, realsize, verbose, debug, dispo); return OK; } @@ -401,9 +427,10 @@ list_external (CT ct, int toplevel, int realsize, int verbose, int debug) */ static int -list_application (CT ct, int toplevel, int realsize, int verbose, int debug) +list_application (CT ct, int toplevel, int realsize, int verbose, int debug, + int dispo) { - list_content (ct, toplevel, realsize, verbose, debug); + list_content (ct, toplevel, realsize, verbose, debug, dispo); return OK; } @@ -421,7 +448,7 @@ list_encoding (CT ct) fprintf (stderr, " decoded fp 0x%x file \"%s\"\n", (unsigned int)(unsigned long) ce->ce_fp, - ce->ce_file ? ce->ce_file : ""); + FENDNULL(ce->ce_file)); return OK; }