X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhlist.c;h=6d7b8e7a6a594a32d56416864e0a61eedb4eeed4;hp=685c8ff7b14c3e911fb8c39e78a5b91b6d0ee01c;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=8d8f1c3abc586c005c904e52c4adbfe694d2201c diff --git a/uip/mhlist.c b/uip/mhlist.c index 685c8ff..6d7b8e7 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -15,27 +15,27 @@ #include #include #include +#include +#include +#include +#include static struct swit switches[] = { -#define HEADSW 0 - { "headers", 0 }, -#define NHEADSW 1 - { "noheaders", 0 }, -#define VERBSW 2 +#define VERBSW 0 { "verbose", 0 }, -#define NVERBSW 3 - { "noverbose", 0 }, -#define FILESW 4 /* interface from show */ +#define NVERBSW 1 + { "noverbose", 2 }, +#define FILESW 2 /* interface from show */ { "file file", 0 }, -#define PARTSW 5 +#define PARTSW 3 { "part number", 0 }, -#define TYPESW 6 +#define TYPESW 4 { "type content", 0 }, -#define VERSIONSW 7 - { "version", 0 }, -#define HELPSW 8 +#define VERSIONSW 5 + { "Version", 0 }, +#define HELPSW 6 { "help", 0 }, -#define DEBUGSW 9 +#define DEBUGSW 7 { "debug", -5 }, { NULL, 0 } }; @@ -72,12 +72,12 @@ void set_endian(void); void flush_errors(void); /* mhlistsbr.c */ -void list_all_messages(CT *, int, int, int); +void list_all_messages(CT *, int, int); /* mhfree.c */ void free_content(CT); extern CT *cts; -void freects_done(int) NORETURN; +void freects_done(); /* ** static prototypes @@ -88,7 +88,6 @@ static void pipeser(int); int main(int argc, char **argv) { - int headsw = 1; int msgnum; char *cp, *file = NULL, *folder = NULL; char *maildir, buf[100], **argp; @@ -97,11 +96,11 @@ main(int argc, char **argv) struct msgs *mp = NULL; CT ct, *ctp; - done=freects_done; + if (atexit(freects_done) != 0) { + adios(EX_OSERR, NULL, "atexit failed"); + } -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -118,46 +117,39 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); - - case HEADSW: - headsw = 1; - continue; - case NHEADSW: - headsw = 0; - continue; + exit(argc == 2 ? EX_OK : EX_USAGE); case PARTSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (npart >= NPARTS) - adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS); + adios(EX_USAGE, NULL, "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", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (ntype >= NTYPES) - adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES); + adios(EX_USAGE, NULL, "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", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); file = *cp == '-' ? cp : getcpy(expanddir(cp)); continue; @@ -175,7 +167,7 @@ main(int argc, char **argv) } if (*cp == '+' || *cp == '@') { if (folder) - adios(NULL, "only one folder at a time!"); + adios(EX_USAGE, NULL, "only one folder at a time!"); else folder = getcpy(expandfol(cp)); } else @@ -199,14 +191,13 @@ main(int argc, char **argv) tmp = getcpy(toabsdir(invo_name)); if (file && msgs.size) - adios(NULL, "cannot specify msg and file at same time!"); + adios(EX_USAGE, NULL, "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 = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts)); ctp = cts; if ((ct = parse_mime(file))) @@ -222,25 +213,26 @@ main(int argc, char **argv) maildir = toabsdir(folder); if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + adios(EX_OSERR, 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); + adios(EX_IOERR, NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); + adios(EX_DATAERR, NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ - for (msgnum = 0; msgnum < msgs.size; msgnum++) - if (!m_convert(mp, msgs.msgs[msgnum])) - done (1); + for (msgnum = 0; msgnum < msgs.size; msgnum++) { + if (!m_convert(mp, msgs.msgs[msgnum])) { + exit(EX_SOFTWARE); + } + } seq_setprev(mp); /* set the previous-sequence */ - if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1), - sizeof(*cts)))) - adios(NULL, "out of memory"); + cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1), + sizeof(*cts)); ctp = cts; for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { @@ -255,7 +247,7 @@ main(int argc, char **argv) } if (!*cts) - done(1); + exit(EX_SOFTWARE); userrs = 1; SIGNAL(SIGQUIT, quitser); @@ -279,7 +271,7 @@ main(int argc, char **argv) /* ** List the message content */ - list_all_messages(cts, headsw, verbosw, debugsw); + list_all_messages(cts, verbosw, debugsw); /* Now free all the structures for the content */ for (ctp = cts; *ctp; ctp++) @@ -296,8 +288,7 @@ main(int argc, char **argv) context_save(); /* save the context file */ } - done(0); - return 1; + return EX_OK; } @@ -311,6 +302,6 @@ pipeser(int i) fflush(stderr); } - done(1); + _exit(EX_IOERR); /* NOTREACHED */ }