X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=d4bf6a6a05b107a4e7e167a42fa520fdffd5ed4a;hp=f8e6e3870a02b1903bd78c0ef5e70180c34bbd30;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/uip/mhtest.c b/uip/mhtest.c index f8e6e38..d4bf6a6 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -9,66 +9,44 @@ #include #include #include -#include #include #include -#include #include #include #include -#include #include - -#ifdef HAVE_SYS_WAIT_H -# include -#endif +#include +#include +#include +#include static struct swit switches[] = { -#define CHECKSW 0 - { "check", 0 }, -#define NCHECKSW 1 - { "nocheck", 0 }, -#define VERBSW 2 +#define VERBSW 0 { "verbose", 0 }, -#define NVERBSW 3 - { "noverbose", 0 }, -#define FILESW 4 +#define NVERBSW 1 + { "noverbose", 2 }, +#define FILESW 2 { "file file", 0 }, -#define OUTFILESW 5 +#define OUTFILESW 3 { "outfile file", 0 }, -#define PARTSW 6 +#define PARTSW 4 { "part number", 0 }, -#define TYPESW 7 +#define TYPESW 5 { "type content", 0 }, -#define RCACHESW 8 - { "rcache policy", 0 }, -#define WCACHESW 9 - { "wcache policy", 0 }, -#define VERSIONSW 10 - { "version", 0 }, -#define HELPSW 11 +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 { "help", 0 }, - -/* -** switches for debugging -*/ -#define DEBUGSW 12 +#define DEBUGSW 8 { "debug", -5 }, { NULL, 0 } }; - -int ebcdicsw = 0; /* hack for linking purposes */ +char *version=VERSION; /* mhparse.c */ extern char *tmp; /* directory to place temp files */ -/* mhcachesbr.c */ -extern int rcachesw; -extern int wcachesw; -extern char *cache_public; -extern char *cache_private; - /* mhmisc.c */ extern int npart; extern int ntype; @@ -88,33 +66,33 @@ int verbosw = 0; #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 (int) NORETURN; +void freects_done(); /* ** static prototypes */ -static int write_content (CT *, char *); -static RETSIGTYPE pipeser (int); +static int write_content(CT *, char *); +static void pipeser(int); int -main (int argc, char **argv) +main(int argc, char **argv) { - int msgnum, *icachesw; + int msgnum; char *cp, *file = NULL, *folder = NULL; char *maildir, buf[100], *outfile = NULL; char **argp, **arguments; @@ -122,17 +100,17 @@ 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 = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; /* @@ -140,75 +118,50 @@ main (int argc, char **argv) */ while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, switches)) { + switch (smatch(++cp, switches)) { case AMBIGSW: - ambigsw (cp, switches); - done (1); + ambigsw(cp, switches); + 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); + 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); - 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; + exit(argc == 2 ? EX_OK : EX_USAGE); case PARTSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + 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", argp[-2]); + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (ntype >= NTYPES) - adios (NULL, "too many types (starting with %s), %d max", + 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", argp[-2]); - file = *cp == '-' ? cp : path (cp, TFILE); + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); + file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp)); continue; case OUTFILESW: if (!(cp = *argp++) || (*cp == '-' && cp[1])) - adios (NULL, "missing argument to %s", argp[-2]); - outfile = *cp == '-' ? cp : path (cp, TFILE); + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); + outfile = *cp == '-' ? cp : mh_xstrdup(expanddir(cp)); continue; case VERBSW: @@ -224,9 +177,9 @@ do_cache: } 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 = pluspath (cp); + folder = mh_xstrdup(expandfol(cp)); } else app_msgarg(&msgs, cp); } @@ -235,94 +188,80 @@ do_cache: parts[npart] = NULL; types[ntype] = NULL; - set_endian (); + 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)); + adios(EX_USAGE, NULL, "must specify output 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); + 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)); + tmp = mh_xstrdup(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 = mh_xcalloc(2, sizeof(*cts)); ctp = cts; - if ((ct = parse_mime (file))); + if ((ct = parse_mime(file))) *ctp++ = ct; } else { /* ** message(s) are coming from a folder */ if (!msgs.size) - app_msgarg(&msgs, "cur"); + app_msgarg(&msgs, seq_cur); if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); + folder = getcurfol(); + maildir = toabsdir(folder); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + 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 (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read(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); - seq_setprev (mp); /* set the previous-sequence */ + if (!m_convert(mp, msgs.msgs[msgnum])) + exit(EX_USAGE); + 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++) { if (is_selected(mp, msgnum)) { char *msgnam; - msgnam = m_name (msgnum); - if ((ct = parse_mime (msgnam))) + msgnam = m_name(msgnum); + if ((ct = parse_mime(msgnam))) *ctp++ = ct; } } } if (!*cts) - done (1); + exit(EX_SOFTWARE); userrs = 1; - SIGNAL (SIGQUIT, quitser); - SIGNAL (SIGPIPE, pipeser); + SIGNAL(SIGQUIT, quitser); + SIGNAL(SIGPIPE, pipeser); /* ** Get the associated umask for the relevant contents. @@ -331,8 +270,8 @@ do_cache: struct stat st; ct = *ctp; - if (type_ok (ct, 1) && !ct->c_umask) { - if (stat (ct->c_file, &st) != NOTOK) + 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(); @@ -342,53 +281,51 @@ do_cache: /* ** Write the content to a file */ - write_content (cts, outfile); + write_content(cts, outfile); /* Now free all the structures for the content */ for (ctp = cts; *ctp; ctp++) - free_content (*ctp); + free_content(*ctp); - free ((char *) cts); - cts = NULL; + mh_free0(&cts); /* 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 */ + 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 */ } - done (0); - return 1; + return EX_OK; } static int -write_content (CT *cts, char *outfile) +write_content(CT *cts, char *outfile) { CT ct, *ctp; for (ctp = cts; *ctp; ctp++) { ct = *ctp; - output_message (ct, outfile); + output_message(ct, outfile); } - flush_errors (); + flush_errors(); return OK; } -static RETSIGTYPE -pipeser (int i) +static void +pipeser(int i) { if (i == SIGQUIT) { - unlink ("core"); - fflush (stdout); - fprintf (stderr, "\n"); - fflush (stderr); + unlink("core"); + fflush(stdout); + fprintf(stderr, "\n"); + fflush(stderr); } - done (1); + exit(EX_IOERR); /* NOTREACHED */ }