#include <h/mh.h>
#include <fcntl.h>
#include <h/signals.h>
-#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 HEADSW 2
- { "headers", 0 },
-#define NHEADSW 3
- { "noheaders", 0 },
-#define SIZESW 4
- { "realsize", 0 },
-#define NSIZESW 5
- { "norealsize", 0 },
-#define VERBSW 6
+#define VERBSW 0
{ "verbose", 0 },
-#define NVERBSW 7
+#define NVERBSW 1
{ "noverbose", 0 },
-#define FILESW 8 /* interface from show */
+#define FILESW 2 /* interface from show */
{ "file file", 0 },
-#define PARTSW 9
+#define PARTSW 3
{ "part number", 0 },
-#define TYPESW 10
+#define TYPESW 4
{ "type content", 0 },
-#define RCACHESW 11
- { "rcache policy", 0 },
-#define WCACHESW 12
- { "wcache policy", 0 },
-#define VERSIONSW 13
- { "version", 0 },
-#define HELPSW 14
+#define VERSIONSW 5
+ { "Version", 0 },
+#define HELPSW 6
{ "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW 15
+#define DEBUGSW 7
{ "debug", -5 },
{ NULL, 0 }
};
/* mhparse.c */
extern char *tmp; /* directory to place temp files */
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
/* mhmisc.c */
extern int npart;
extern int ntype;
void flush_errors(void);
/* mhlistsbr.c */
-void list_all_messages(CT *, int, int, int, int);
+void list_all_messages(CT *, int, int);
/* mhfree.c */
void free_content(CT);
/*
** static prototypes
*/
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
int
main(int argc, char **argv)
{
- int sizesw = 1, headsw = 1;
- int msgnum, *icachesw;
+ int msgnum;
char *cp, *file = NULL, *folder = NULL;
char *maildir, buf[100], **argp;
char **arguments;
print_version(invo_name);
done(1);
- case RCACHESW:
- icachesw = &rcachesw;
- goto do_cache;
- case WCACHESW:
- icachesw = &wcachesw;
-do_cache:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- switch (*icachesw = smatch(cp, caches)) {
- case AMBIGSW:
- ambigsw(cp, caches);
- done(1);
- case UNKWNSW:
- adios(NULL, "%s unknown", cp);
- default:
- break;
- }
- continue;
-
- case CHECKSW:
- checksw++;
- continue;
- case NCHECKSW:
- checksw = 0;
- continue;
-
- case HEADSW:
- headsw = 1;
- continue;
- case NHEADSW:
- headsw = 0;
- continue;
-
- case SIZESW:
- sizesw = 1;
- continue;
- case NSIZESW:
- sizesw = 0;
- continue;
-
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
case FILESW:
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
- adios(NULL, "missing argument to %s", argp[-2]);
- file = *cp == '-' ? cp : path(cp, TFILE);
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
case VERBSW:
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();
- /* Check for public cache location */
- if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
- cache_public = NULL;
-
- /* Check for private cache location */
- if (!(cache_private = context_find(nmhprivcache)))
- cache_private = ".cache";
- cache_private = getcpy(m_maildir(cache_private));
-
/*
** Check for storage directory. If specified,
** then store temporary files there. Else we
if ((cp = context_find(nmhstorage)) && *cp)
tmp = concat(cp, "/", invo_name, NULL);
else
- tmp = add(m_maildir(invo_name), NULL);
+ tmp = getcpy(toabsdir(invo_name));
if (file && msgs.size)
adios(NULL, "cannot specify msg and file at same time!");
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 = getfolder(FCUR);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
/*
** List the message content
*/
- list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+ list_all_messages(cts, verbosw, debugsw);
/* Now free all the structures for the content */
for (ctp = cts; *ctp; ctp++)
/* If reading from a folder, do some updating */
if (mp) {
- context_replace(pfolder, folder); /* update current folder */
+ 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 */
}
-static RETSIGTYPE
+static void
pipeser(int i)
{
if (i == SIGQUIT) {
projects / mmh / blobdiff