#include <h/md5.h>
#include <errno.h>
#include <signal.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>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
static struct swit switches[] = {
#define CHECKSW 0
{ "check", 0 },
#define NCHECKSW 1
{ "nocheck", 0 },
-#define PAUSESW 2
- { "pause", 0 },
-#define NPAUSESW 3
- { "nopause", 0 },
-#define SERIALSW 4
- { "serialonly", 0 },
-#define NSERIALSW 5
- { "noserialonly", 0 },
-#define VERBSW 6
+#define VERBSW 2
{ "verbose", 0 },
-#define NVERBSW 7
+#define NVERBSW 3
{ "noverbose", 0 },
-#define FILESW 8 /* interface from show */
+#define FILESW 4 /* interface from show */
{ "file file", 0 },
-#define FORMSW 9
+#define FORMSW 5
{ "form formfile", 0 },
-#define PARTSW 10
+#define PARTSW 6
{ "part number", 0 },
-#define TYPESW 11
+#define TYPESW 7
{ "type content", 0 },
-#define RCACHESW 12
+#define RCACHESW 8
{ "rcache policy", 0 },
-#define WCACHESW 13
+#define WCACHESW 9
{ "wcache policy", 0 },
-#define VERSIONSW 14
+#define VERSIONSW 10
{ "version", 0 },
-#define HELPSW 15
+#define HELPSW 11
{ "help", 0 },
-
-/*
-** switches for moreproc/mhlproc
-*/
-#define PROGSW 16
- { "moreproc program", -4 },
-#define NPROGSW 17
- { "nomoreproc", -3 },
-#define LENSW 18
- { "length lines", -4 },
-#define WIDTHSW 19
- { "width columns", -4 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW 20
+#define DEBUGSW 12
{ "debug", -5 },
{ NULL, 0 }
};
extern char *cache_private;
/* mhshowsbr.c */
-extern int pausesw;
-extern int serialsw;
-extern char *progsw;
extern int nolist;
-extern int nomore; /* flags for moreproc/header display */
extern char *formsw;
/* mhmisc.c */
/*
** static prototypes
*/
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
int
checksw = 0;
continue;
- case PAUSESW:
- pausesw = 1;
- continue;
- case NPAUSESW:
- pausesw = 0;
- continue;
-
- case SERIALSW:
- serialsw = 1;
- continue;
- case NSERIALSW:
- serialsw = 0;
- continue;
-
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
formsw = getcpy(etcpath(cp));
continue;
- /*
- ** Switches for moreproc/mhlproc
- */
- case PROGSW:
- if (!(progsw = *argp++) || *progsw == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
- case NPROGSW:
- nomore++;
- continue;
-
- case LENSW:
- case WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
-
case VERBSW:
verbosw = 1;
continue;
set_endian();
- if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) {
+ if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
nolist = 1;
- pausesw = 0;
}
/*
adios(NULL, "out of memory");
ctp = cts;
- if ((ct = parse_mime(file)));
+ if ((ct = parse_mime(file)))
*ctp++ = ct;
} else {
/*
** message(s) are coming from a folder
*/
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
folder = getcurfol();
maildir = toabsdir(folder);
set_unseen(mp, msgnum);
seq_setprev(mp); /* set the Previous-Sequence */
- seq_setunseen(mp, 1); /* unset the Unseen-Sequence */
+ seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */
if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
sizeof(*cts))))
}
-static RETSIGTYPE
+static void
pipeser(int i)
{
if (i == SIGQUIT) {