#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>
{ "check", 0 },
#define NCHECKSW 1
{ "nocheck", 0 },
-#define PAUSESW 2
- { "pause", 0 },
-#define NPAUSESW 3
- { "nopause", 0 },
-#define SERIALSW 4
+#define SERIALSW 2
{ "serialonly", 0 },
-#define NSERIALSW 5
+#define NSERIALSW 3
{ "noserialonly", 0 },
-#define VERBSW 6
+#define VERBSW 4
{ "verbose", 0 },
-#define NVERBSW 7
+#define NVERBSW 5
{ "noverbose", 0 },
-#define FILESW 8 /* interface from show */
+#define FILESW 6 /* interface from show */
{ "file file", 0 },
-#define FORMSW 9
+#define FORMSW 7
{ "form formfile", 0 },
-#define PARTSW 10
+#define PARTSW 8
{ "part number", 0 },
-#define TYPESW 11
+#define TYPESW 9
{ "type content", 0 },
-#define RCACHESW 12
+#define RCACHESW 10
{ "rcache policy", 0 },
-#define WCACHESW 13
+#define WCACHESW 11
{ "wcache policy", 0 },
-#define VERSIONSW 14
+#define VERSIONSW 12
{ "version", 0 },
-#define HELPSW 15
+#define HELPSW 13
{ "help", 0 },
-
/*
** switches for moreproc/mhlproc
*/
-#define PROGSW 16
+#define PROGSW 14
{ "moreproc program", -4 },
-#define NPROGSW 17
- { "nomoreproc", -3 },
-#define LENSW 18
+#define LENSW 15
{ "length lines", -4 },
-#define WIDTHSW 19
+#define WIDTHSW 16
{ "width columns", -4 },
-
/*
** switches for debugging
*/
-#define DEBUGSW 20
+#define DEBUGSW 17
{ "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 */
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
checksw = 0;
continue;
- case PAUSESW:
- pausesw = 1;
- continue;
- case NPAUSESW:
- pausesw = 0;
- continue;
-
case SERIALSW:
serialsw = 1;
continue;
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
adios(NULL, "missing argument to %s",
argp[-2]);
- file = *cp == '-' ? cp : path(cp, TFILE);
+ file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
case FORMSW:
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
- case NPROGSW:
- nomore++;
- continue;
case LENSW:
case WIDTHSW:
if (folder)
adios(NULL, "only one folder at a time!");
else
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
set_endian();
- if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) {
+ if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
nolist = 1;
- pausesw = 0;
}
/*
/* Check for private cache location */
if (!(cache_private = context_find(nmhprivcache)))
cache_private = ".cache";
- cache_private = getcpy(m_maildir(cache_private));
+ cache_private = getcpy(toabsdir(cache_private));
/*
** Check for storage directory. If specified,
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));
+ tmp = getcpy(toabsdir(invo_name));
if (file && msgs.size)
adios(NULL, "cannot specify msg and file at same time!");
** message(s) are coming from a folder
*/
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
- folder = getfolder(1);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
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))))
/* If reading from a folder, do some updating */
if (mp) {
- context_replace(pfolder, folder); /* update current folder */
- seq_setcur(mp, mp->hghsel); /* update current message */
+ context_replace(curfolder, folder); /* update current folder */
+ seq_setcur(mp, mp->hghsel); /* update current message */
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
}