#define MHSHOW_SWITCHES \
X("check", 0, CHECKSW) \
X("nocheck", 0, NCHECKSW) \
- X("pause", 0, PAUSESW) \
- X("nopause", 0, NPAUSESW) \
- X("serialonly", 0, SERIALSW) \
- X("noserialonly", 0, NSERIALSW) \
X("verbose", 0, VERBSW) \
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) \
#undef X
-/* mhparse.c */
-extern char *tmp; /* directory to place temp files */
-
/* mhcachesbr.c */
extern int rcachesw;
extern int wcachesw;
extern char *cache_private;
/* mhshowsbr.c */
-extern int pausesw;
-extern int serialsw;
extern char *progsw;
extern int nomore; /* flags for moreproc/header display */
extern char *formsw;
+extern char *folder;
+extern char *headerform;
+extern char *markerform;
+extern int headersw;
/* mhmisc.c */
extern int npart;
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;
CT parse_mime (char *);
/* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
int type_ok (CT, int);
void flush_errors (void);
-/* mhshowsbr.c */
-void show_all_messages (CT *);
-
/* mhfree.c */
extern CT *cts;
void freects_done (int) NORETURN;
int
main (int argc, char **argv)
{
- int msgnum, *icachesw;
- 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;
- done=freects_done;
-
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
+ if (nmh_init(argv[0], 1)) { return 1; }
- /* read user profile/context */
- context_read();
+ 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:
+ 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);
checksw = 0;
continue;
- case PAUSESW:
- pausesw = 1;
+ case CONCATSW:
+ concatsw = 1;
continue;
- case NPAUSESW:
- pausesw = 0;
+ case NCONCATSW:
+ concatsw = 0;
continue;
-
- case SERIALSW:
- serialsw = 1;
+ case TEXTONLYSW:
+ textonly = 1;
+ continue;
+ case NTEXTONLYSW:
+ textonly = 0;
+ continue;
+ case INLINESW:
+ inlineonly = 1;
continue;
- case NSERIALSW:
- serialsw = 0;
+ case NINLINESW:
+ inlineonly = 0;
continue;
case PARTSW:
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]);
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
*/
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:
parts[npart] = NULL;
types[ntype] = NULL;
+ /*
+ * If we had any specific parts or types specified, turn off text only
+ * content.
+ */
+
+ if (npart > 0 || ntype > 0) {
+ if (textonly == -1)
+ textonly = 0;
+ if (inlineonly == -1)
+ inlineonly = 0;
+ }
+
/*
* Check if we've specified an additional profile
*/
cache_private = ".cache";
cache_private = getcpy (m_maildir (cache_private));
- /*
- * Check for storage directory. If specified,
- * then store temporary files there. Else we
- * store them in standard nmh directory.
- */
- if ((cp = context_find (nmhstorage)) && *cp)
- tmp = concat (cp, "/", invo_name, NULL);
- else
- tmp = add (m_maildir (invo_name), NULL);
-
if (!context_find ("path"))
free (path ("./", TFOLDER));
* 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
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;
/*
context_save (); /* save the context file */
}
+ if (concatsw)
+ m_popen(moreproc, 0);
+
/*
* Show the message content
*/
- show_all_messages (cts);
+ 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 (concatsw)
+ m_pclose();
+
done (0);
return 1;
}
projects / nmh / blobdiff