X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/22de44b40389f3c6ec7f5d811eb8349cc9d499bf..6015bb1f7:/uip/mhshow.c?ds=inline diff --git a/uip/mhshow.c b/uip/mhshow.c index edf3f1e3..146b8bf2 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -1,6 +1,4 @@ - -/* - * mhshow.c -- display the contents of MIME messages +/* mhshow.c -- display the contents of MIME messages * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -13,10 +11,15 @@ #include #include #include +#include #include #include #include #include +#include "../sbr/m_maildir.h" +#include "../sbr/m_popen.h" +#include "mhfree.h" +#include "mhshowsbr.h" #define MHSHOW_SWITCHES \ X("check", 0, CHECKSW) \ @@ -25,10 +28,19 @@ X("noverbose", 0, NVERBSW) \ X("concat", 0, CONCATSW) \ X("noconcat", 0, NCONCATSW) \ + X("textonly", 0, TEXTONLYSW) \ + X("notextonly", 0, NTEXTONLYSW) \ + X("inlineonly", 0, INLINESW) \ + X("noinlineonly", 0, NINLINESW) \ X("file file", 0, FILESW) \ X("form formfile", 0, FORMSW) \ + X("header", 0, HEADSW) \ + X("noheader", 0, NHEADSW) \ + X("headerform formfile", 0, HEADFORMSW) \ + X("markform formfile", 0, MARKFORMSW) \ X("part number", 0, PARTSW) \ X("type content", 0, TYPESW) \ + X("prefer content", 0, PREFERSW) \ X("rcache policy", 0, RCACHESW) \ X("wcache policy", 0, WCACHESW) \ X("version", 0, VERSIONSW) \ @@ -54,17 +66,6 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches); #undef X -/* mhcachesbr.c */ -extern int rcachesw; -extern int wcachesw; -extern char *cache_public; -extern char *cache_private; - -/* mhshowsbr.c */ -extern char *progsw; -extern int nomore; /* flags for moreproc/header display */ -extern char *formsw; - /* mhmisc.c */ extern int npart; extern int ntype; @@ -72,6 +73,11 @@ extern char *parts[NPARTS + 1]; extern char *types[NTYPES + 1]; extern int userrs; +/* mhparse.c */ +extern char *preferred_types[]; +extern char *preferred_subtypes[]; +extern int npreferred; + int debugsw = 0; int verbosw = 0; @@ -81,14 +87,10 @@ int verbosw = 0; CT parse_mime (char *); /* mhmisc.c */ -int part_ok (CT, int); +int part_ok (CT); int type_ok (CT, int); void flush_errors (void); -/* mhfree.c */ -extern CT *cts; -void freects_done (int) NORETURN; - /* * static prototypes */ @@ -98,8 +100,8 @@ static void pipeser (int); int main (int argc, char **argv) { - int msgnum, *icachesw, concatsw = 1, textonly = 1, inlineonly = 1; - char *cp, *file = NULL, *folder = NULL; + int msgnum, *icachesw, concatsw = -1, textonly = -1, inlineonly = -1; + char *cp, *file = NULL; char *maildir, buf[100], **argp; char **arguments; struct msgs_array msgs = { 0, 0, NULL }; @@ -120,13 +122,13 @@ main (int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { - case AMBIGSW: + case AMBIGSW: ambigsw (cp, switches); done (1); - case UNKWNSW: + case UNKWNSW: adios (NULL, "-%s unknown", cp); - case HELPSW: + case HELPSW: snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help (buf, switches, 1); @@ -143,9 +145,9 @@ main (int argc, char **argv) do_cache: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - switch (*icachesw = smatch (cp, caches)) { + switch (*icachesw = smatch (cp, cache_policy)) { case AMBIGSW: - ambigsw (cp, caches); + ambigsw (cp, cache_policy); done (1); case UNKWNSW: adios (NULL, "%s unknown", cp); @@ -167,6 +169,18 @@ do_cache: case NCONCATSW: concatsw = 0; continue; + case TEXTONLYSW: + textonly = 1; + continue; + case NTEXTONLYSW: + textonly = 0; + continue; + case INLINESW: + inlineonly = 1; + continue; + case NINLINESW: + inlineonly = 0; + continue; case PARTSW: if (!(cp = *argp++) || *cp == '-') @@ -186,6 +200,18 @@ do_cache: types[ntype++] = cp; continue; + case PREFERSW: + if (!(cp = *argp++) || *cp == '-') + adios (NULL, "missing argument to %s", argp[-2]); + if (npreferred >= NPREFS) + adios (NULL, "too many preferred types (starting with %s), %d max", + cp, NPREFS); + preferred_types[npreferred] = cp; + cp = strchr(cp, '/'); + if (cp) *cp++ = '\0'; + preferred_subtypes[npreferred++] = cp; + continue; + case FILESW: if (!(cp = *argp++) || (*cp == '-' && cp[1])) adios (NULL, "missing argument to %s", argp[-2]); @@ -195,11 +221,27 @@ do_cache: case FORMSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - if (formsw) - free (formsw); + mh_xfree(formsw); formsw = getcpy (etcpath (cp)); continue; + case HEADSW: + headersw = 1; + continue; + case NHEADSW: + headersw = 0; + continue; + + case HEADFORMSW: + if (!(headerform = *argp++) || *headerform == '-') + adios (NULL, "missing argument to %s", argp[-2]); + continue; + + case MARKFORMSW: + if (!(markerform = *argp++) || *markerform == '-') + adios (NULL, "missing argument to %s", argp[-2]); + continue; + /* * Switches for moreproc/mhlproc */ @@ -217,10 +259,10 @@ do_cache: adios (NULL, "missing argument to %s", argp[-2]); continue; - case VERBSW: + case VERBSW: verbosw = 1; continue; - case NVERBSW: + case NVERBSW: verbosw = 0; continue; case DEBUGSW: @@ -231,8 +273,7 @@ do_cache: if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); + folder = pluspath (cp); } else app_msgarg(&msgs, cp); } @@ -247,8 +288,10 @@ do_cache: */ if (npart > 0 || ntype > 0) { - textonly = 0; - inlineonly = 0; + if (textonly == -1) + textonly = 0; + if (inlineonly == -1) + inlineonly = 0; } /* @@ -290,12 +333,13 @@ do_cache: * check if message is coming from file */ if (file) { - if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts)))) - adios (NULL, "out of memory"); + cts = mh_xcalloc(2, sizeof *cts); ctp = cts; if ((ct = parse_mime (file))) *ctp++ = ct; + + headersw = 0; } else { /* * message(s) are coming from a folder @@ -334,8 +378,7 @@ do_cache: seq_setprev (mp); /* set the Previous-Sequence */ seq_setunseen (mp, 1); /* unset the Unseen-Sequence */ - if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts)))) - adios (NULL, "out of memory"); + cts = mh_xcalloc(mp->numsel + 1, sizeof *cts); ctp = cts; /* @@ -382,6 +425,9 @@ do_cache: context_save (); /* save the context file */ } + if (concatsw) + m_popen(moreproc, 0); + /* * Show the message content */ @@ -391,9 +437,12 @@ do_cache: for (ctp = cts; *ctp; ctp++) free_content (*ctp); - free ((char *) cts); + free(cts); cts = NULL; + if (concatsw) + m_pclose(); + done (0); return 1; }