-
-/*
- * mhn.c -- display, list, cache, or store the contents of MIME messages
+/* mhn.c -- display, list, cache, or store 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_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 <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>
+#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 "mhfree.h"
+#include "mhshowsbr.h"
#define MHN_SWITCHES \
X("auto", 0, AUTOSW) \
X("noheaders", 0, NHEADSW) \
X("list", 0, LISTSW) \
X("nolist", 0, NLISTSW) \
- X("pause", 0, PAUSESW) \
- X("nopause", 0, NPAUSESW) \
X("realsize", 0, SIZESW) \
X("norealsize", 0, NSIZESW) \
- X("serialonly", 0, SERIALSW) \
- X("noserialonly", 0, NSERIALSW) \
X("show", 0, SHOWSW) \
X("noshow", 0, NSHOWSW) \
X("store", 0, STORESW) \
*/ \
X("build", -5, BUILDSW) \
X("nobuild", -7, NBUILDSW) \
- X("rfc934mode", -10, RFC934SW) \
- X("norfc934mode", -12, NRFC934SW) \
+ X("rfc934mode", 0, RFC934SW) \
+ X("norfc934mode", 0, NRFC934SW) \
#define X(sw, minchars, id) id,
DEFINE_SWITCH_ENUM(MHN);
#undef X
-/* 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;
-
-/* 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;
-
-/* mhstoresbr.c */
-extern int autosw;
-extern char *cwd; /* cache current working directory */
-
-/* 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;
/*
* variables for mhbuild (mhn -build)
*/
-static int buildsw = 0;
+static bool buildsw;
static int rfc934sw = 0;
/*
* what action to take?
*/
-static int cachesw = 0;
-static int listsw = 0;
-static int showsw = 0;
-static int storesw = 0;
+static bool cachesw;
+static bool listsw;
+static bool showsw;
+static bool storesw;
#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);
-
-/* mhshowsbr.c */
-void show_all_messages (CT *);
-
-/* mhlistsbr.c */
-void list_all_messages (CT *, int, int, int, int);
-
-/* mhstoresbr.c */
-void store_all_messages (CT *);
-
-/* mhcachesbr.c */
-void cache_all_messages (CT *);
-
-/* mhfree.c */
-void free_content (CT);
-extern CT *cts;
-void freects_done (int) NORETURN;
-
/*
* static prototypes
*/
int
main (int argc, char **argv)
{
- int sizesw = 1, headsw = 1;
+ bool sizesw = true;
+ bool headsw = true;
+ bool autosw = false;
int msgnum, *icachesw;
char *cp, *file = NULL, *folder = NULL;
char *maildir, buf[100], **argp;
char **arguments;
+ char *cwd;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp = NULL;
CT ct, *ctp;
FILE *fp;
+ mhstoreinfo_t info;
- done=freects_done;
+ if (nmh_init(argv[0], true, true)) { return 1; }
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ set_done(freects_done);
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
ambigsw (cp, switches);
done (1);
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ die("-%s unknown", cp);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
done (0);
case AUTOSW:
- autosw++;
+ autosw = true;
continue;
case NAUTOSW:
- autosw = 0;
+ autosw = false;
continue;
case CACHESW:
- cachesw++;
+ cachesw = true;
continue;
case NCACHESW:
- cachesw = 0;
+ cachesw = false;
continue;
case RCACHESW:
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;
}
continue;
case HEADSW:
- headsw = 1;
+ headsw = true;
continue;
case NHEADSW:
- headsw = 0;
+ headsw = false;
continue;
case LISTSW:
- listsw = 1;
+ listsw = true;
continue;
case NLISTSW:
- listsw = 0;
- continue;
-
- case PAUSESW:
- pausesw = 1;
- continue;
- case NPAUSESW:
- pausesw = 0;
- continue;
-
- case SERIALSW:
- serialsw = 1;
- continue;
- case NSERIALSW:
- serialsw = 0;
+ listsw = false;
continue;
case SHOWSW:
- showsw = 1;
+ showsw = true;
continue;
case NSHOWSW:
- showsw = 0;
+ showsw = false;
continue;
case SIZESW:
- sizesw = 1;
+ sizesw = true;
continue;
case NSIZESW:
- sizesw = 0;
+ sizesw = false;
continue;
case STORESW:
- storesw = 1;
+ storesw = true;
continue;
case NSTORESW:
- storesw = 0;
+ storesw = false;
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 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 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;
/*
* Switches for mhbuild
*/
case BUILDSW:
- buildsw = 1;
+ buildsw = true;
continue;
case NBUILDSW:
- buildsw = 0;
+ buildsw = false;
continue;
case RFC934SW:
rfc934sw = 1;
}
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 ((cp = getenv ("MHN"))) {
if ((fp = fopen (cp, "r"))) {
- readconfig ((struct node **) 0, fp, cp, 0);
+ readconfig(NULL, fp, cp, 0);
fclose (fp);
} else {
admonish ("", "unable to read $MHN 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));
/*
* Cache the current directory before we do any chdirs()'s.
*/
- cwd = getcpy (pwd());
-
- /*
- * 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);
+ cwd = mh_xstrdup(pwd());
if (!context_find ("path"))
free (path ("./", TFOLDER));
int vecp;
if (showsw || storesw || cachesw)
- adios (NULL, "cannot use -build with -show, -store, -cache");
+ die("cannot use -build with -show, -store, -cache");
if (msgs.size < 1)
- adios (NULL, "need to specify a %s composition file", invo_name);
+ die("need to specify a %s composition file", invo_name);
if (msgs.size > 1)
- adios (NULL, "only one %s composition file at a time", invo_name);
+ die("only one %s composition file at a time", invo_name);
vecp = 0;
vec[vecp++] = "mhbuild";
execvp ("mhbuild", vec);
fprintf (stderr, "unable to exec ");
- _exit (-1);
+ _exit(1);
}
/*
execvp ("mhbuild", vec);
fprintf (stderr, "unable to exec ");
- _exit (-1);
+ _exit(1);
}
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)))
adios (maildir, "unable to change directory to");
/* read folder and create message structure */
- if (!(mp = folder_read (folder)))
- adios (NULL, "unable to read folder %s", folder);
+ if (!(mp = folder_read (folder, 1)))
+ 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++)
done (1);
seq_setprev (mp); /* set the previous-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;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
* at a time.
*/
if (showsw + listsw + storesw + cachesw > 1)
- adios (NULL, "can only use one of -show, -list, -store, -cache at same time");
+ die("can only use one of -show, -list, -store, -cache at same time");
/* If no action is specified, assume -show */
if (!listsw && !showsw && !storesw && !cachesw)
- showsw = 1;
+ showsw = true;
- userrs = 1;
+ userrs = true;
SIGNAL (SIGQUIT, quitser);
SIGNAL (SIGPIPE, pipeser);
* List the message content
*/
if (listsw)
- list_all_messages (cts, headsw, sizesw, verbosw, debugsw);
+ list_all_messages (cts, headsw, sizesw, verbosw, debugsw, 0);
/*
* Store the message content
*/
- if (storesw)
- store_all_messages (cts);
+ if (storesw) {
+ info = mhstoreinfo_create (cts, cwd, "always", autosw, verbosw);
+ store_all_messages (info);
+ mhstoreinfo_free (info);
+ }
+
+ /* 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 */
+ seq_save (mp); /* synchronize sequences */
+ context_save (); /* save the context file */
+ }
/*
* Cache the message content
* Show the message content
*/
if (showsw)
- show_all_messages (cts);
+ show_all_messages (cts, 0, 0, 0);
/* Now free all the structures for the content */
for (ctp = cts; *ctp; ctp++)
free_content (*ctp);
- free ((char *) cts);
+ free (cts);
cts = NULL;
- /* 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 */
- seq_save (mp); /* synchronize sequences */
- context_save (); /* save the context file */
- }
-
done (0);
return 1;
}
pipeser (int i)
{
if (i == SIGQUIT) {
- unlink ("core");
fflush (stdout);
fprintf (stderr, "\n");
fflush (stderr);
projects / nmh / blobdiff