X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=dd456263796649b743a38adb305516bb6db5607c;hp=9a73bbfa336bb276b3d5bcd5691791ed822a5c79;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=7879ea4084333b448c5a3a49c1cb52023e3808d1 diff --git a/uip/mhtest.c b/uip/mhtest.c index 9a73bbf..dd45626 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -1,81 +1,50 @@ - /* - * mhtest.c -- test harness for MIME routines - * - * $Id$ - */ +** mhtest.c -- test harness for MIME routines +** +** 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 #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 +#include +#include +#include +#include static struct swit switches[] = { -#define CHECKSW 0 - { "check", 0 }, -#define NCHECKSW 1 - { "nocheck", 0 }, -#define VERBSW 2 - { "verbose", 0 }, -#define NVERBSW 3 - { "noverbose", 0 }, -#define FILESW 4 - { "file file", 0 }, -#define OUTFILESW 5 - { "outfile file", 0 }, -#define PARTSW 6 - { "part number", 0 }, -#define TYPESW 7 - { "type content", 0 }, -#define RCACHESW 8 - { "rcache policy", 0 }, -#define WCACHESW 9 - { "wcache policy", 0 }, -#define VERSIONSW 10 - { "version", 0 }, -#define HELPSW 11 - { "help", 0 }, - -/* - * switches for debugging - */ -#define DEBUGSW 12 - { "debug", -5 }, - { NULL, 0 } +#define VERBSW 0 + { "verbose", 0 }, +#define NVERBSW 1 + { "noverbose", 2 }, +#define FILESW 2 + { "file file", 0 }, +#define OUTFILESW 3 + { "outfile file", 0 }, +#define PARTSW 4 + { "part number", 0 }, +#define TYPESW 5 + { "type content", 0 }, +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 + { "help", 0 }, +#define DEBUGSW 8 + { "debug", -5 }, + { NULL, 0 } }; -extern int errno; - -int ebcdicsw = 0; /* hack for linking purposes */ - /* mhparse.c */ -extern int checksw; -extern char *tmp; /* directory to place temp files */ - -/* mhcachesbr.c */ -extern int rcachesw; -extern int wcachesw; -extern char *cache_public; -extern char *cache_private; +extern char *tmp; /* directory to place temp files */ /* mhmisc.c */ extern int npart; @@ -85,350 +54,279 @@ extern char *types[NTYPES + 1]; extern int userrs; /* - * This is currently needed to keep mhparse happy. - * This needs to be changed. - */ +** This is currently needed to keep mhparse happy. +** This needs to be changed. +*/ pid_t xpid = 0; int debugsw = 0; int verbosw = 0; -/* The list of top-level contents to display */ -CT *cts = NULL; - -#define quitser pipeser +#define quitser pipeser /* mhparse.c */ -CT parse_mime (char *); +CT parse_mime(char *); /* mhoutsbr.c */ -int output_message (CT, char *); +int output_message(CT, char *); /* mhmisc.c */ -int part_ok (CT, int); -int type_ok (CT, int); -void set_endian (void); -void flush_errors (void); +int part_ok(CT, int); +int type_ok(CT, int); +void set_endian(void); +void flush_errors(void); /* mhfree.c */ -void free_content (CT); +void free_content(CT); +extern CT *cts; +void freects_done(); /* - * static prototypes - */ -static int write_content (CT *, char *); -static RETSIGTYPE pipeser (int); +** static prototypes +*/ +static int write_content(CT *, char *); +static void pipeser(int); int -main (int argc, char **argv) +main(int argc, char **argv) { - int nummsgs, maxmsgs, msgnum, *icachesw; - char *cp, *file = NULL, *folder = NULL; - char *maildir, buf[100], *outfile = NULL; - char **argp, **arguments, **msgs; - struct msgs *mp = NULL; - CT ct, *ctp; - -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* read user profile/context */ - context_read(); - - arguments = getarguments (invo_name, argc, argv, 1); - 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++)) { - if (*cp == '-') { - switch (smatch (++cp, switches)) { - case AMBIGSW: - ambigsw (cp, switches); - done (1); - case UNKWNSW: - adios (NULL, "-%s unknown", cp); - - case HELPSW: - snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", - invo_name); - print_help (buf, switches, 1); - done (1); - case VERSIONSW: - print_version(invo_name); - done (1); - - case RCACHESW: - icachesw = &rcachesw; - goto do_cache; - case WCACHESW: - icachesw = &wcachesw; -do_cache: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - switch (*icachesw = smatch (cp, caches)) { - case AMBIGSW: - ambigsw (cp, caches); - done (1); - case UNKWNSW: - adios (NULL, "%s unknown", cp); - default: - break; - } - continue; - - case CHECKSW: - checksw++; - continue; - case NCHECKSW: - checksw = 0; - continue; - - case PARTSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if (npart >= NPARTS) - adios (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", argp[-2]); - if (ntype >= NTYPES) - adios (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", argp[-2]); - file = *cp == '-' ? cp : path (cp, TFILE); - continue; - - case OUTFILESW: - if (!(cp = *argp++) || (*cp == '-' && cp[1])) - adios (NULL, "missing argument to %s", argp[-2]); - outfile = *cp == '-' ? cp : path (cp, TFILE); - continue; - - case VERBSW: - verbosw = 1; - continue; - case NVERBSW: - verbosw = 0; - continue; - case DEBUGSW: - debugsw = 1; - continue; - } - } - if (*cp == '+' || *cp == '@') { - 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; + int msgnum; + char *cp, *file = NULL, *folder = NULL; + char *maildir, buf[100], *outfile = NULL; + char **argp, **arguments; + struct msgs_array msgs = { 0, 0, NULL }; + struct msgs *mp = NULL; + CT ct, *ctp; + + if (atexit(freects_done) != 0) { + adios(EX_OSERR, NULL, "atexit failed"); } - } - - /* null terminate the list of acceptable parts/types */ - parts[npart] = NULL; - types[ntype] = NULL; - - set_endian (); - - if (outfile == NULL) - adios (NULL, "must specify output file"); - - /* Check for public cache location */ - if ((cache_public = context_find (nmhcache)) && *cache_public != '/') - cache_public = NULL; - - /* Check for private cache location */ - if (!(cache_private = context_find (nmhprivcache))) - cache_private = ".cache"; - cache_private = getcpy (m_maildir (cache_private)); - - /* - * 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); - - if (!context_find ("path")) - free (path ("./", TFOLDER)); - - if (file && nummsgs) - adios (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"); - ctp = cts; - - if ((ct = parse_mime (file))); - *ctp++ = ct; - } else { + + setlocale(LC_ALL, ""); + invo_name = mhbasename(argv[0]); + + /* read user profile/context */ + context_read(); + + arguments = getarguments(invo_name, argc, argv, 1); + argp = arguments; + /* - * message(s) are coming from a folder - */ - if (!nummsgs) - msgs[nummsgs++] = "cur"; - if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); - - if (chdir (maildir) == NOTOK) - 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); - - /* check for empty folder */ - if (mp->nummsg == 0) - 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])) - 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"); - ctp = cts; - - for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { - if (is_selected(mp, msgnum)) { - char *msgnam; - - msgnam = m_name (msgnum); - if ((ct = parse_mime (msgnam))) - *ctp++ = ct; - } - } - } - - if (!*cts) - done (1); - - userrs = 1; - SIGNAL (SIGQUIT, quitser); - SIGNAL (SIGPIPE, pipeser); - - /* - * Get the associated umask for the relevant contents. - */ - for (ctp = cts; *ctp; ctp++) { - struct stat st; - - ct = *ctp; - if (type_ok (ct, 1) && !ct->c_umask) { - if (stat (ct->c_file, &st) != NOTOK) - ct->c_umask = ~(st.st_mode & 0777); - else - ct->c_umask = ~m_gmprot(); + ** Parse arguments + */ + while ((cp = *argp++)) { + if (*cp == '-') { + switch (smatch(++cp, switches)) { + case AMBIGSW: + ambigsw(cp, switches); + exit(EX_USAGE); + case UNKWNSW: + adios(EX_USAGE, NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); + print_help(buf, switches, 1); + exit(argc == 2 ? EX_OK : EX_USAGE); + case VERSIONSW: + print_version(invo_name); + exit(argc == 2 ? EX_OK : EX_USAGE); + + case PARTSW: + if (!(cp = *argp++) || *cp == '-') + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + if (npart >= 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(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + if (ntype >= 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(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); + file = *cp == '-' ? cp : getcpy(expanddir(cp)); + continue; + + case OUTFILESW: + if (!(cp = *argp++) || (*cp == '-' && cp[1])) + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); + outfile = *cp == '-' ? cp : getcpy(expanddir(cp)); + continue; + + case VERBSW: + verbosw = 1; + continue; + case NVERBSW: + verbosw = 0; + continue; + case DEBUGSW: + debugsw = 1; + continue; + } + } + if (*cp == '+' || *cp == '@') { + if (folder) + adios(EX_USAGE, NULL, "only one folder at a time!"); + else + folder = getcpy(expandfol(cp)); + } else + app_msgarg(&msgs, cp); } - } - /* - * Write the content to a file - */ - write_content (cts, outfile); + /* null terminate the list of acceptable parts/types */ + parts[npart] = NULL; + types[ntype] = NULL; - /* Now free all the structures for the content */ - for (ctp = cts; *ctp; ctp++) - free_content (*ctp); + set_endian(); - free ((char *) cts); - cts = NULL; + if (outfile == NULL) + adios(EX_USAGE, NULL, "must specify output file"); - /* 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 */ - } + /* + ** 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 = getcpy(toabsdir(invo_name)); + + if (file && msgs.size) + adios(EX_USAGE, NULL, "cannot specify msg and file at same time!"); - return done (0); -} + /* + ** check if message is coming from file + */ + if (file) { + cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts)); + ctp = cts; + + if ((ct = parse_mime(file))) + *ctp++ = ct; + } else { + /* + ** message(s) are coming from a folder + */ + if (!msgs.size) + app_msgarg(&msgs, seq_cur); + if (!folder) + folder = getcurfol(); + maildir = toabsdir(folder); + + if (chdir(maildir) == NOTOK) + adios(EX_OSERR, maildir, "unable to change directory to"); + + /* read folder and create message structure */ + if (!(mp = folder_read(folder))) + adios(EX_IOERR, NULL, "unable to read folder %s", folder); + + /* check for empty folder */ + if (mp->nummsg == 0) + 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])) + exit(EX_USAGE); + seq_setprev(mp); /* set the previous-sequence */ + + cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1), + sizeof(*cts)); + ctp = cts; + + for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { + if (is_selected(mp, msgnum)) { + char *msgnam; + + msgnam = m_name(msgnum); + if ((ct = parse_mime(msgnam))) + *ctp++ = ct; + } + } + } + if (!*cts) + exit(EX_SOFTWARE); -static int -write_content (CT *cts, char *outfile) -{ - CT ct, *ctp; + userrs = 1; + SIGNAL(SIGQUIT, quitser); + SIGNAL(SIGPIPE, pipeser); + + /* + ** Get the associated umask for the relevant contents. + */ + for (ctp = cts; *ctp; ctp++) { + struct stat st; + + ct = *ctp; + if (type_ok(ct, 1) && !ct->c_umask) { + if (stat(ct->c_file, &st) != NOTOK) + ct->c_umask = ~(st.st_mode & 0777); + else + ct->c_umask = ~m_gmprot(); + } + } - for (ctp = cts; *ctp; ctp++) { - ct = *ctp; - output_message (ct, outfile); - } + /* + ** Write the content to a file + */ + write_content(cts, outfile); + + /* Now free all the structures for the content */ + for (ctp = cts; *ctp; ctp++) + free_content(*ctp); + + free((char *) cts); + cts = NULL; + + /* If reading from a folder, do some updating */ + if (mp) { + context_replace(curfolder, folder); /* update current folder */ + seq_setcur(mp, mp->hghsel); /* update current message */ + seq_save(mp); /* synchronize sequences */ + context_save(); /* save the context file */ + } - flush_errors (); - return OK; + return EX_OK; } -static RETSIGTYPE -pipeser (int i) +static int +write_content(CT *cts, char *outfile) { - if (i == SIGQUIT) { - unlink ("core"); - fflush (stdout); - fprintf (stderr, "\n"); - fflush (stderr); - } - - done (1); - /* NOTREACHED */ + CT ct, *ctp; + + for (ctp = cts; *ctp; ctp++) { + ct = *ctp; + output_message(ct, outfile); + } + + flush_errors(); + return OK; } -int -done (int status) +static void +pipeser(int i) { - CT *ctp; - - if ((ctp = cts)) - for (; *ctp; ctp++) - free_content (*ctp); + if (i == SIGQUIT) { + unlink("core"); + fflush(stdout); + fprintf(stderr, "\n"); + fflush(stderr); + } - exit (status); - return 1; /* dead code to satisfy the compiler */ + exit(EX_IOERR); + /* NOTREACHED */ }