X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2..2d8a2d23b4c17ffb277d008f4e011fcc2bb2fa7e:/uip/mhn.c diff --git a/uip/mhn.c b/uip/mhn.c index 27ee05b4..b2db3070 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -2,8 +2,6 @@ /* * mhn.c -- display, list, cache, or store the contents of MIME messages * - * $Id$ - * * 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. @@ -13,126 +11,73 @@ #include #include #include -#include -#include #include #include #include #include #include - -#ifdef HAVE_SYS_WAIT_H -# include -#endif - -/* - * We allocate space for message names (msgs array) - * this number of elements at a time. - */ -#define MAXMSGS 256 - - -static struct swit switches[] = { -#define AUTOSW 0 - { "auto", 0 }, -#define NAUTOSW 1 - { "noauto", 0 }, -#define CACHESW 2 - { "cache", 0 }, -#define NCACHESW 3 - { "nocache", 0 }, -#define CHECKSW 4 - { "check", 0 }, -#define NCHECKSW 5 - { "nocheck", 0 }, -#define HEADSW 6 - { "headers", 0 }, -#define NHEADSW 7 - { "noheaders", 0 }, -#define LISTSW 8 - { "list", 0 }, -#define NLISTSW 9 - { "nolist", 0 }, -#define PAUSESW 10 - { "pause", 0 }, -#define NPAUSESW 11 - { "nopause", 0 }, -#define SIZESW 12 - { "realsize", 0 }, -#define NSIZESW 13 - { "norealsize", 0 }, -#define SERIALSW 14 - { "serialonly", 0 }, -#define NSERIALSW 15 - { "noserialonly", 0 }, -#define SHOWSW 16 - { "show", 0 }, -#define NSHOWSW 17 - { "noshow", 0 }, -#define STORESW 18 - { "store", 0 }, -#define NSTORESW 19 - { "nostore", 0 }, -#define VERBSW 20 - { "verbose", 0 }, -#define NVERBSW 21 - { "noverbose", 0 }, -#define FILESW 22 /* interface from show */ - { "file file", 0 }, -#define FORMSW 23 - { "form formfile", 0 }, -#define PARTSW 24 - { "part number", 0 }, -#define TYPESW 25 - { "type content", 0 }, -#define RCACHESW 26 - { "rcache policy", 0 }, -#define WCACHESW 27 - { "wcache policy", 0 }, -#define VERSIONSW 28 - { "version", 0 }, -#define HELPSW 29 - { "help", 0 }, - -/* - * switches for debugging - */ -#define DEBUGSW 30 - { "debug", -5 }, - -/* - * switches for moreproc/mhlproc - */ -#define PROGSW 31 - { "moreproc program", -4 }, -#define NPROGSW 32 - { "nomoreproc", -3 }, -#define LENSW 33 - { "length lines", -4 }, -#define WIDTHSW 34 - { "width columns", -4 }, - -/* - * switches for mhbuild - */ -#define BUILDSW 35 - { "build", -5 }, -#define NBUILDSW 36 - { "nobuild", -7 }, -#define EBCDICSW 37 - { "ebcdicsafe", -10 }, -#define NEBCDICSW 38 - { "noebcdicsafe", -12 }, -#define RFC934SW 39 - { "rfc934mode", -10 }, -#define NRFC934SW 40 - { "norfc934mode", -12 }, - { NULL, 0 } -}; +#include + +#define MHN_SWITCHES \ + X("auto", 0, AUTOSW) \ + X("noauto", 0, NAUTOSW) \ + X("cache", 0, CACHESW) \ + X("nocache", 0, NCACHESW) \ + X("check", 0, CHECKSW) \ + X("nocheck", 0, NCHECKSW) \ + X("headers", 0, HEADSW) \ + 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("nostore", 0, NSTORESW) \ + X("verbose", 0, VERBSW) \ + X("noverbose", 0, NVERBSW) \ + X("file file", 0, FILESW) \ + X("form formfile", 0, FORMSW) \ + X("part number", 0, PARTSW) \ + X("type content", 0, TYPESW) \ + X("rcache policy", 0, RCACHESW) \ + X("wcache policy", 0, WCACHESW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + /* \ + * for debugging \ + */ \ + X("debug", -5, DEBUGSW) \ + /* \ + * switches for moreproc/mhlproc \ + */ \ + X("moreproc program", -4, PROGSW) \ + X("nomoreproc", -3, NPROGSW) \ + X("length lines", -4, LENSW) \ + X("width columns", -4, WIDTHSW) \ + /* \ + * switches for mhbuild \ + */ \ + X("build", -5, BUILDSW) \ + X("nobuild", -7, NBUILDSW) \ + X("rfc934mode", -10, RFC934SW) \ + X("norfc934mode", -12, NRFC934SW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(MHN); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(MHN, switches); +#undef X /* mhparse.c */ -extern int checksw; extern char *tmp; /* directory to place temp files */ /* mhcachesbr.c */ @@ -163,14 +108,10 @@ extern int userrs; int debugsw = 0; int verbosw = 0; -/* The list of top-level contents to display */ -CT *cts = NULL; - /* * variables for mhbuild (mhn -build) */ static int buildsw = 0; -static int ebcdicsw = 0; static int rfc934sw = 0; /* @@ -189,7 +130,6 @@ CT parse_mime (char *); /* mhmisc.c */ int part_ok (CT, int); int type_ok (CT, int); -void set_endian (void); void flush_errors (void); /* mhshowsbr.c */ @@ -205,26 +145,30 @@ void store_all_messages (CT *); void cache_all_messages (CT *); /* mhfree.c */ -void free_content (CT); +extern CT *cts; +void freects_done (int) NORETURN; /* * static prototypes */ -static RETSIGTYPE pipeser (int); +static void pipeser (int); int main (int argc, char **argv) { int sizesw = 1, headsw = 1; - int nummsgs, maxmsgs, msgnum, *icachesw; + int msgnum, *icachesw; char *cp, *file = NULL, *folder = NULL; char *maildir, buf[100], **argp; - char **arguments, **msgs; + char **arguments; + struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp = NULL; CT ct, *ctp; FILE *fp; + done=freects_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -236,14 +180,6 @@ main (int argc, char **argv) arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; - /* - * Allocate the initial space to record message - * names, ranges, and sequences. - */ - nummsgs = 0; - maxmsgs = MAXMSGS; - msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs))); - /* * Parse arguments */ @@ -260,10 +196,10 @@ main (int argc, char **argv) snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case AUTOSW: autosw++; @@ -418,12 +354,6 @@ do_cache: case NRFC934SW: rfc934sw = -1; continue; - case EBCDICSW: - ebcdicsw = 1; - continue; - case NEBCDICSW: - ebcdicsw = -1; - continue; case VERBSW: verbosw = 1; @@ -440,34 +370,15 @@ do_cache: if (folder) adios (NULL, "only one folder at a time!"); else - folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); - } else { - /* - * Check if we need to allocate more space - * for message names/ranges/sequences. - */ - if (nummsgs >= maxmsgs) { - maxmsgs += MAXMSGS; - if (!(msgs = (char **) realloc (msgs, - (size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to reallocate msgs storage"); - } - msgs[nummsgs++] = cp; - } + folder = pluspath (cp); + } else + app_msgarg(&msgs, cp); } /* null terminate the list of acceptable parts/types */ parts[npart] = NULL; types[ntype] = NULL; - set_endian (); - - if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) { - nolist = 1; - listsw = 0; - pausesw = 0; - } - /* * Check if we've specified an additional profile */ @@ -524,25 +435,20 @@ do_cache: if (showsw || storesw || cachesw) adios (NULL, "cannot use -build with -show, -store, -cache"); - if (nummsgs < 1) + if (msgs.size < 1) adios (NULL, "need to specify a %s composition file", invo_name); - if (nummsgs > 1) + if (msgs.size > 1) adios (NULL, "only one %s composition file at a time", invo_name); vecp = 0; vec[vecp++] = "mhbuild"; - if (ebcdicsw == 1) - vec[vecp++] = "-ebcdicsafe"; - else if (ebcdicsw == -1) - vec[vecp++] = "-noebcdicsafe"; - if (rfc934sw == 1) vec[vecp++] = "-rfc934mode"; else if (rfc934sw == -1) vec[vecp++] = "-norfc934mode"; - vec[vecp++] = msgs[0]; + vec[vecp++] = msgs.msgs[0]; vec[vecp] = NULL; execvp ("mhbuild", vec); @@ -553,10 +459,10 @@ do_cache: /* * Process a mhn composition file (old MH style) */ - if (nummsgs == 1 && !folder && !npart && !cachesw + if (msgs.size == 1 && !folder && !npart && !cachesw && !showsw && !storesw && !ntype && !file && (cp = getenv ("mhdraft")) - && strcmp (cp, msgs[0]) == 0) { + && strcmp (cp, msgs.msgs[0]) == 0) { char *vec[MAXARGS]; int vecp; @@ -564,11 +470,6 @@ do_cache: vecp = 0; vec[vecp++] = "mhbuild"; - if (ebcdicsw == 1) - vec[vecp++] = "-ebcdicsafe"; - else if (ebcdicsw == -1) - vec[vecp++] = "-noebcdicsafe"; - if (rfc934sw == 1) vec[vecp++] = "-rfc934mode"; else if (rfc934sw == -1) @@ -582,7 +483,7 @@ do_cache: _exit (-1); } - if (file && nummsgs) + if (file && msgs.size) adios (NULL, "cannot specify msg and file at same time!"); /* @@ -593,14 +494,14 @@ do_cache: 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 (!nummsgs) - msgs[nummsgs++] = "cur"; + if (!msgs.size) + app_msgarg(&msgs, "cur"); if (!folder) folder = getfolder (1); maildir = m_maildir (folder); @@ -609,7 +510,7 @@ do_cache: adios (maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) + if (!(mp = folder_read (folder, 1))) adios (NULL, "unable to read folder %s", folder); /* check for empty folder */ @@ -617,8 +518,8 @@ do_cache: adios (NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ - for (msgnum = 0; msgnum < nummsgs; msgnum++) - if (!m_convert (mp, msgs[msgnum])) + for (msgnum = 0; msgnum < msgs.size; msgnum++) + if (!m_convert (mp, msgs.msgs[msgnum])) done (1); seq_setprev (mp); /* set the previous-sequence */ @@ -709,15 +610,15 @@ do_cache: context_save (); /* save the context file */ } - return done (0); + done (0); + return 1; } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) { - unlink ("core"); fflush (stdout); fprintf (stderr, "\n"); fflush (stderr); @@ -726,17 +627,3 @@ pipeser (int i) done (1); /* NOTREACHED */ } - - -int -done (int status) -{ - CT *ctp; - - if ((ctp = cts)) - for (; *ctp; ctp++) - free_content (*ctp); - - exit (status); - return 1; /* dead code to satisfy the compiler */ -}