From 2863aba03e380b0b80d6c4bc3368452ab4d49008 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Fri, 18 Apr 2014 10:03:27 -0400 Subject: [PATCH] Remove mhtest(8). --- .gitignore | 1 - Makefile.am | 7 +- docs/pending-release-notes | 1 + uip/mhtest.c | 351 ------------------------------------- 4 files changed, 2 insertions(+), 358 deletions(-) delete mode 100644 uip/mhtest.c diff --git a/.gitignore b/.gitignore index e3335a9b..e432a0e2 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,6 @@ a.out.dSYM/ /uip/mhpath /uip/mhshow /uip/mhstore -/uip/mhtest /uip/mkstemp /uip/msgchk /uip/msh diff --git a/Makefile.am b/Makefile.am index 46f7b904..e6db2075 100644 --- a/Makefile.am +++ b/Makefile.am @@ -154,7 +154,7 @@ bin_SCRIPTS = uip/mhmail etc/sendfiles ## auxexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \ uip/post uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty \ - uip/slocal uip/viamail uip/mhtest + uip/slocal uip/viamail auxexec_SCRIPTS = uip/spost @@ -427,11 +427,6 @@ uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) -uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \ - uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \ - uip/md5.c -uip_mhtest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) - uip_mkstemp_SOURCES = uip/mkstemp.c uip_mkstemp_LDADD = $(LDADD) $(POSTLINK) diff --git a/docs/pending-release-notes b/docs/pending-release-notes index 755d6bda..62168a74 100644 --- a/docs/pending-release-notes +++ b/docs/pending-release-notes @@ -10,6 +10,7 @@ OBSOLETE FEATURES - The undocumented -queue switch to post was deprecated in nmh 1.6, and was removed in this release. - conflict(8) was deprecated in nmh 1.6, and was removed in this release. +- mhtest(8) was deprecated in nmh 1.6, and was removed in this release. ------------------- DEPRECATED FEATURES diff --git a/uip/mhtest.c b/uip/mhtest.c deleted file mode 100644 index 38e33a84..00000000 --- a/uip/mhtest.c +++ /dev/null @@ -1,351 +0,0 @@ - -/* - * 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 - -#define MHTEST_SWITCHES \ - X("check", 0, CHECKSW) \ - X("nocheck", 0, NCHECKSW) \ - X("verbose", 0, VERBSW) \ - X("noverbose", 0, NVERBSW) \ - X("file file", 0, FILESW) \ - X("outfile file", 0, OUTFILESW) \ - X("part number", 0, PARTSW) \ - X("type content", 0, TYPESW) \ - X("rcache policy", 0, RCACHESW) \ - X("wcache policy", 0, WCACHESW) \ - X("version", 0, VERSIONSW) \ - X("help", 0, HELPSW) \ - X("debug", -5, DEBUGSW) \ - -#define X(sw, minchars, id) id, -DEFINE_SWITCH_ENUM(MHTEST); -#undef X - -#define X(sw, minchars, id) { sw, minchars, id }, -DEFINE_SWITCH_ARRAY(MHTEST, switches); -#undef X - - -/* mhcachesbr.c */ -extern int rcachesw; -extern int wcachesw; -extern char *cache_public; -extern char *cache_private; - -/* mhmisc.c */ -extern int npart; -extern int ntype; -extern char *parts[NPARTS + 1]; -extern char *types[NTYPES + 1]; -extern int userrs; - -/* - * This is currently needed to keep mhparse happy. - * This needs to be changed. - */ -int debugsw = 0; -int verbosw = 0; - -#define quitser pipeser - -/* mhparse.c */ -CT parse_mime (char *); - -/* mhoutsbr.c */ -int output_message (CT, char *); - -/* mhmisc.c */ -int part_ok (CT, int); -int type_ok (CT, int); -void flush_errors (void); - -/* mhfree.c */ -extern CT *cts; -void freects_done (int) NORETURN; - -/* - * static prototypes - */ -static int write_content (CT *, char *); -static void pipeser (int); - - -int -main (int argc, char **argv) -{ - int msgnum, *icachesw; - 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 (nmh_init(argv[0], 1)) { return 1; } - - done=freects_done; - - arguments = getarguments (invo_name, argc, argv, 1); - argp = arguments; - - /* - * 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 (0); - case VERSIONSW: - print_version(invo_name); - done (0); - - 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 = pluspath (cp); - } else - app_msgarg(&msgs, cp); - } - - /* null terminate the list of acceptable parts/types */ - parts[npart] = NULL; - types[ntype] = NULL; - - 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)); - - if (!context_find ("path")) - free (path ("./", TFOLDER)); - - if (file && msgs.size) - 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 { - /* - * message(s) are coming from a folder - */ - if (!msgs.size) - app_msgarg(&msgs, "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, 1))) - 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 < msgs.size; msgnum++) - if (!m_convert (mp, msgs.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(); - } - } - - /* - * 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 (pfolder, 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; -} - - -static int -write_content (CT *cts, char *outfile) -{ - CT ct, *ctp; - - for (ctp = cts; *ctp; ctp++) { - ct = *ctp; - output_message (ct, outfile); - } - - flush_errors (); - return OK; -} - - -static void -pipeser (int i) -{ - if (i == SIGQUIT) { - fflush (stdout); - fprintf (stderr, "\n"); - fflush (stderr); - } - - done (1); - /* NOTREACHED */ -} -- 2.56.0