X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a514b8a78c447c8abc69386bee9f2c463b1c9362..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhn.c?ds=sidebyside diff --git a/uip/mhn.c b/uip/mhn.c index 8cd3acdd..4a3b33a7 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -1,6 +1,4 @@ - -/* - * 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 @@ -13,10 +11,15 @@ #include #include #include +#include #include #include #include #include +#include "mhmisc.h" +#include "sbr/m_maildir.h" +#include "mhfree.h" +#include "mhshowsbr.h" #define MHN_SWITCHES \ X("auto", 0, AUTOSW) \ @@ -29,12 +32,8 @@ 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) \ @@ -65,8 +64,8 @@ */ \ 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); @@ -77,27 +76,6 @@ DEFINE_SWITCH_ARRAY(MHN, switches); #undef X -/* 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; - -/* 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; @@ -117,33 +95,6 @@ static int storesw = 0; #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 */ -typedef struct mhstoreinfo *mhstoreinfo_t; -mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int); -void mhstoreinfo_free(mhstoreinfo_t); -void store_all_messages (mhstoreinfo_t); - -/* mhcachesbr.c */ -void cache_all_messages (CT *); - -/* mhfree.c */ -extern CT *cts; -void freects_done (int) NORETURN; - /* * static prototypes */ @@ -215,9 +166,9 @@ main (int argc, char **argv) do_cache: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - switch (*icachesw = smatch (cp, caches)) { + switch (*icachesw = smatch (cp, cache_policy)) { case AMBIGSW: - ambigsw (cp, caches); + ambigsw (cp, cache_policy); done (1); case UNKWNSW: adios (NULL, "%s unknown", cp); @@ -247,20 +198,6 @@ do_cache: listsw = 0; continue; - case PAUSESW: - pausesw = 1; - continue; - case NPAUSESW: - pausesw = 0; - continue; - - case SERIALSW: - serialsw = 1; - continue; - case NSERIALSW: - serialsw = 0; - continue; - case SHOWSW: showsw = 1; continue; @@ -309,8 +246,7 @@ do_cache: case FORMSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - if (formsw) - free (formsw); + free(formsw); formsw = getcpy (etcpath (cp)); continue; @@ -361,8 +297,7 @@ do_cache: if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); + folder = pluspath (cp); } else app_msgarg(&msgs, cp); } @@ -376,7 +311,7 @@ do_cache: */ 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); @@ -387,7 +322,7 @@ do_cache: * 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); } @@ -403,7 +338,7 @@ do_cache: /* * Cache the current directory before we do any chdirs()'s. */ - cwd = add(pwd(), NULL); + cwd = mh_xstrdup(pwd()); if (!context_find ("path")) free (path ("./", TFOLDER)); @@ -472,8 +407,7 @@ do_cache: * 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))) @@ -505,8 +439,7 @@ do_cache: 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++) { @@ -557,7 +490,7 @@ do_cache: * 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 @@ -568,6 +501,14 @@ do_cache: 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 */ @@ -578,7 +519,7 @@ do_cache: * 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++) @@ -587,14 +528,6 @@ do_cache: 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; }