X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhn.c;h=65e78d31d98b3a1d0820ae8c534c7ebdcdd27bf9;hb=b3bc649e0562c9aa68acdf7fb5c8c03335cafb25;hp=f73853e465d2304cadbb851d6bf11cbdffffd73c;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822;p=mmh diff --git a/uip/mhn.c b/uip/mhn.c index f73853e..65e78d3 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -2,7 +2,9 @@ /* * 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. */ #include @@ -11,22 +13,12 @@ #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 - +#include static struct swit switches[] = { #define AUTOSW 0 @@ -88,7 +80,7 @@ static struct swit switches[] = { #define VERSIONSW 28 { "version", 0 }, #define HELPSW 29 - { "help", 4 }, + { "help", 0 }, /* * switches for debugging @@ -127,10 +119,7 @@ static struct swit switches[] = { }; -extern int errno; - /* mhparse.c */ -extern int checksw; extern char *tmp; /* directory to place temp files */ /* mhcachesbr.c */ @@ -161,9 +150,6 @@ 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) */ @@ -187,7 +173,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 */ @@ -204,25 +189,30 @@ 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 @@ -235,15 +225,6 @@ main (int argc, char **argv) argp = arguments; /* - * Allocate the initial space to record message - * names, ranges, and sequences. - */ - nummsgs = 0; - maxmsgs = MAXMSGS; - if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to allocate storage"); - - /* * Parse arguments */ while ((cp = *argp++)) { @@ -259,10 +240,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++; @@ -439,34 +420,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 */ @@ -523,9 +485,9 @@ 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; @@ -541,7 +503,7 @@ do_cache: else if (rfc934sw == -1) vec[vecp++] = "-norfc934mode"; - vec[vecp++] = msgs[0]; + vec[vecp++] = msgs.msgs[0]; vec[vecp] = NULL; execvp ("mhbuild", vec); @@ -552,10 +514,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; @@ -581,7 +543,7 @@ do_cache: _exit (-1); } - if (file && nummsgs) + if (file && msgs.size) adios (NULL, "cannot specify msg and file at same time!"); /* @@ -592,14 +554,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); @@ -616,8 +578,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 */ @@ -708,11 +670,12 @@ 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) { @@ -725,17 +688,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 */ -}