X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhtest.c;h=a1718db77e082691d8857d63c457cd0ecc155a23;hb=2823e13f67239db7deb7274f3a47bfbff56c7c64;hp=621c701dabf3c50eda1222ae8ea7402002deb98d;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh diff --git a/uip/mhtest.c b/uip/mhtest.c index 621c701..a1718db 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -9,66 +9,39 @@ #include #include #include -#include #include #include -#include #include #include #include -#include #include -#ifdef HAVE_SYS_WAIT_H -# include -#endif - 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 */ - /* 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; @@ -102,19 +75,19 @@ void flush_errors(void); /* mhfree.c */ 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 void pipeser(int); int 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,12 +95,10 @@ main(int argc, char **argv) struct msgs *mp = NULL; CT ct, *ctp; - done=freects_done; + atexit(freects_done); -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex(argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); @@ -143,44 +114,17 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(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); + exit(0); 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(0); case PARTSW: if (!(cp = *argp++) || *cp == '-') @@ -203,14 +147,14 @@ do_cache: if (!(cp = *argp++) || (*cp == '-' && cp[1])) adios(NULL, "missing argument to %s", argp[-2]); - file = *cp == '-' ? cp : path(cp, TFILE); + file = *cp == '-' ? cp : getcpy(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); + outfile = *cp == '-' ? cp : getcpy(expanddir(cp)); continue; case VERBSW: @@ -228,7 +172,7 @@ do_cache: if (folder) adios(NULL, "only one folder at a time!"); else - folder = pluspath(cp); + folder = getcpy(expandfol(cp)); } else app_msgarg(&msgs, cp); } @@ -242,15 +186,6 @@ do_cache: 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 @@ -259,10 +194,7 @@ do_cache: 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 = getcpy(toabsdir(invo_name)); if (file && msgs.size) adios(NULL, "cannot specify msg and file at same time!"); @@ -275,17 +207,17 @@ 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 (!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"); @@ -301,7 +233,7 @@ do_cache: /* 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); + exit(1); seq_setprev(mp); /* set the previous-sequence */ if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1), @@ -321,7 +253,7 @@ do_cache: } if (!*cts) - done(1); + exit(1); userrs = 1; SIGNAL(SIGQUIT, quitser); @@ -356,14 +288,13 @@ do_cache: /* If reading from a folder, do some updating */ if (mp) { - context_replace(pfolder, folder); /* update current folder */ + 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 0; } @@ -382,7 +313,7 @@ write_content(CT *cts, char *outfile) } -static RETSIGTYPE +static void pipeser(int i) { if (i == SIGQUIT) { @@ -392,6 +323,6 @@ pipeser(int i) fflush(stderr); } - done(1); + exit(1); /* NOTREACHED */ }