-
-/*
- * 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
* complete copyright information.
*/
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setunseen.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/readconfig.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
#include <fcntl.h>
-#include <h/signals.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
-#include <h/utils.h>
+#include "h/signals.h"
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/fmt_scan.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/mhcachesbr.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_popen.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"
#define MHSHOW_SWITCHES \
X("check", 0, CHECKSW) \
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("noprefer", 0, NPREFERSW) \
X("rcache policy", 0, RCACHESW) \
X("wcache policy", 0, WCACHESW) \
X("version", 0, VERSIONSW) \
#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;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
int debugsw = 0;
int verbosw = 0;
#define quitser pipeser
-/* mhparse.c */
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void flush_errors (void);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-
/*
* static prototypes
*/
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 };
CT ct, *ctp;
FILE *fp;
- if (nmh_init(argv[0], 1)) { return 1; }
+ if (nmh_init(argv[0], true, true)) { return 1; }
- done=freects_done;
+ set_done(freects_done);
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
- case AMBIGSW:
+ case AMBIGSW:
ambigsw (cp, switches);
done (1);
- case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ case UNKWNSW:
+ die("-%s unknown", cp);
- case HELPSW:
+ case HELPSW:
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
invo_name);
print_help (buf, switches, 1);
icachesw = &wcachesw;
do_cache:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- switch (*icachesw = smatch (cp, caches)) {
+ die("missing argument to %s", argp[-2]);
+ switch (*icachesw = smatch (cp, cache_policy)) {
case AMBIGSW:
- ambigsw (cp, caches);
+ ambigsw (cp, cache_policy);
done (1);
case UNKWNSW:
- adios (NULL, "%s unknown", cp);
+ die("%s unknown", cp);
default:
break;
}
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 == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
if (npart >= NPARTS)
- adios (NULL, "too many parts (starting with %s), %d max",
+ die("too many parts (starting with %s), %d max",
cp, NPARTS);
parts[npart++] = cp;
continue;
case TYPESW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
if (ntype >= NTYPES)
- adios (NULL, "too many types (starting with %s), %d max",
+ die("too many types (starting with %s), %d max",
cp, NTYPES);
types[ntype++] = cp;
continue;
+ case PREFERSW:
+ if (!(cp = *argp++) || *cp == '-')
+ die("missing argument to %s", argp[-2]);
+ if (npreferred >= NPREFS)
+ die("too many preferred types (starting with %s), %d max",
+ cp, NPREFS);
+ mime_preference[npreferred].type = cp;
+ cp = strchr(cp, '/');
+ if (cp) *cp++ = '\0';
+ mime_preference[npreferred++].subtype = cp;
+ continue;
+
+ case NPREFERSW:
+ npreferred = 0;
+ continue;
+
case FILESW:
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
file = *cp == '-' ? cp : path (cp, TFILE);
continue;
case FORMSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- if (formsw)
- free (formsw);
- formsw = getcpy (etcpath (cp));
+ die("missing argument to %s", argp[-2]);
+ free(formsw);
+ formsw = mh_xstrdup(etcpath(cp));
+ continue;
+
+ case HEADSW:
+ headersw = 1;
+ continue;
+ case NHEADSW:
+ headersw = 0;
+ continue;
+
+ case HEADFORMSW:
+ if (!(headerform = *argp++) || *headerform == '-')
+ die("missing argument to %s", argp[-2]);
+ continue;
+
+ case MARKFORMSW:
+ if (!(markerform = *argp++) || *markerform == '-')
+ die("missing argument to %s", argp[-2]);
continue;
/*
*/
case PROGSW:
if (!(progsw = *argp++) || *progsw == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case NPROGSW:
nomore++;
case LENSW:
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
- case VERBSW:
+ case VERBSW:
verbosw = 1;
continue;
- case NVERBSW:
+ case NVERBSW:
verbosw = 0;
continue;
case DEBUGSW:
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios (NULL, "only one folder at a time!");
- else
- folder = pluspath (cp);
+ die("only one folder at a time!");
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
*/
if (npart > 0 || ntype > 0) {
- textonly = 0;
- inlineonly = 0;
+ if (textonly == -1)
+ textonly = 0;
+ if (inlineonly == -1)
+ inlineonly = 0;
}
/*
*/
if ((cp = getenv ("MHSHOW"))) {
if ((fp = fopen (cp, "r"))) {
- readconfig ((struct node **) 0, fp, cp, 0);
+ readconfig(NULL, fp, cp, 0);
fclose (fp);
} else {
admonish ("", "unable to read $MHSHOW profile (%s)", cp);
* Read the standard profile setup
*/
if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
- readconfig ((struct node **) 0, fp, cp, 0);
+ readconfig(NULL, fp, cp, 0);
fclose (fp);
}
/* Check for private cache location */
if (!(cache_private = context_find (nmhprivcache)))
cache_private = ".cache";
- cache_private = getcpy (m_maildir (cache_private));
+ cache_private = mh_xstrdup(m_maildir(cache_private));
if (!context_find ("path"))
free (path ("./", TFOLDER));
if (file && msgs.size)
- adios (NULL, "cannot specify msg and file at same time!");
+ die("cannot specify msg and file at same time!");
/*
* 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
/* read folder and create message structure */
if (!(mp = folder_read (folder, 1)))
- adios (NULL, "unable to read folder %s", folder);
+ die("unable to read folder %s", folder);
/* check for empty folder */
if (mp->nummsg == 0)
- adios (NULL, "no messages in %s", folder);
+ die("no messages in %s", folder);
/* parse all the message ranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
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;
/*
if (!*cts)
done (1);
- userrs = 1;
+ userrs = true;
SIGNAL (SIGQUIT, quitser);
SIGNAL (SIGPIPE, pipeser);
context_save (); /* save the context file */
}
- if (concat)
+ if (concatsw)
m_popen(moreproc, 0);
/*
* Show the message content
*/
- show_all_messages (cts, concatsw, textonly, inlineonly, NULL);
+ show_all_messages (cts, concatsw, textonly, inlineonly);
/* Now free all the structures for the content */
for (ctp = cts; *ctp; ctp++)
free_content (*ctp);
- free ((char *) cts);
+ free(cts);
cts = NULL;
- if (concat)
+ if (concatsw)
m_pclose();
done (0);
projects / nmh / blobdiff